The patch titled Subject: dax-add-tracepoint-to-dax_writeback_one-fix has been added to the -mm tree. Its filename is dax-add-tracepoint-to-dax_writeback_one-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/dax-add-tracepoint-to-dax_writeback_one-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/dax-add-tracepoint-to-dax_writeback_one-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: dax-add-tracepoint-to-dax_writeback_one-fix struct blk_dax_ctl has disappeared Cc: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/dax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/dax.c~dax-add-tracepoint-to-dax_writeback_one-fix fs/dax.c --- a/fs/dax.c~dax-add-tracepoint-to-dax_writeback_one-fix +++ a/fs/dax.c @@ -823,7 +823,7 @@ static int dax_writeback_one(struct bloc spin_lock_irq(&mapping->tree_lock); radix_tree_tag_clear(page_tree, index, PAGECACHE_TAG_DIRTY); spin_unlock_irq(&mapping->tree_lock); - trace_dax_writeback_one(mapping->host, index, dax.size >> PAGE_SHIFT); + trace_dax_writeback_one(mapping->host, index, size >> PAGE_SHIFT); dax_unlock: dax_read_unlock(id); put_locked_mapping_entry(mapping, index, entry); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch mm.patch mm-move-madv_free-pages-into-lru_inactive_file-list-checkpatch-fixes.patch mm-use-is_migrate_highatomic-to-simplify-the-code-fix.patch mm-introduce-memalloc_nofs_saverestore-api-fix.patch jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context-fix.patch jbd2-make-the-whole-kjournald2-kthread-nofs-safe-checkpatch-fixes.patch mm-page_alloc-count-movable-pages-when-stealing-from-pageblock-fix.patch swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix.patch checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch taskstats-add-e-u-stime-for-tgid-command-fix.patch taskstats-add-e-u-stime-for-tgid-command-fix-fix.patch kernel-reboot-add-devm_register_reboot_notifier-fix.patch fault-inject-support-systematic-fault-injection-fix.patch linux-next-git-rejects.patch drm-use-set_memoryh-header-fix.patch drivers-staging-media-atomisp-pci-atomisp2-use-set_memoryh.patch docs-vm-transhuge-fix-few-trivial-typos-fix.patch dax-add-tracepoint-to-dax_writeback_one-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html