The patch titled reiser4 vs zoned-allocator has been removed from the -mm tree. Its filename was reiser4-vs-zoned-allocator.patch This patch was dropped because it was folded into reiser4.patch ------------------------------------------------------ Subject: reiser4 vs zoned-allocator From: Andrew Morton <akpm@xxxxxxxx> Update reiser4 for zoned-vm-counters-*.patch Cc: "Vladimir V. Saveliev" <vs@xxxxxxxxxxx> Cc: Christoph Lameter <clameter@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/reiser4/as_ops.c | 3 ++- fs/reiser4/page_cache.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff -puN fs/reiser4/as_ops.c~reiser4-vs-zoned-allocator fs/reiser4/as_ops.c --- a/fs/reiser4/as_ops.c~reiser4-vs-zoned-allocator +++ a/fs/reiser4/as_ops.c @@ -83,7 +83,8 @@ int reiser4_set_page_dirty(struct page * if (page->mapping) { assert("vs-1652", page->mapping == mapping); if (mapping_cap_account_dirty(mapping)) - inc_page_state(nr_dirty); + inc_zone_page_state(page, + NR_FILE_DIRTY); radix_tree_tag_set(&mapping->page_tree, page->index, PAGECACHE_TAG_REISER4_MOVED); diff -puN fs/reiser4/page_cache.c~reiser4-vs-zoned-allocator fs/reiser4/page_cache.c --- a/fs/reiser4/page_cache.c~reiser4-vs-zoned-allocator +++ a/fs/reiser4/page_cache.c @@ -463,7 +463,7 @@ int set_page_dirty_internal(struct page if (!TestSetPageDirty(page)) { if (mapping_cap_account_dirty(mapping)) - inc_page_state(nr_dirty); + inc_zone_page_state(page, NR_FILE_DIRTY); __mark_inode_dirty(mapping->host, I_DIRTY_PAGES); } _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch macintosh-mangle-caps-lock-events-on-adb-keyboards.patch git-ia64.patch git-ieee1394.patch sata_nv-add-back-some-verbosity-into-adma-error_handler.patch git-ubi.patch update-smc91x-driver-with-arm-versatile-board-info.patch drivers-net-ns83820c-add-paramter-to-disable-auto.patch net-uninline-skb_put.patch git-ioat-vs-git-md-accel.patch ioat-warning-fix.patch drivers-scsi-mca_53c9xc-save_flags-cli-removal.patch scsi-cover-up-bugs-fix-up-compiler-warnings-in-megaraid-driver.patch git-ipwireless_cs.patch arch-i386-kernel-alternativec-dont-include-bugsh.patch deprecate-smbfs-in-favour-of-cifs.patch block_write_full_page-handle-enospc.patch filesystem-disk-errors-at-boot-time-caused-by-probe.patch merge-sys_clone-sys_unshare-nsproxy-and-namespace.patch sync_sb_inodes-propagate-errors.patch mips-convert-to-use-shared-apm-emulation-fix.patch schedule_on_each_cpu-use-preempt_disable.patch implement-flush_work-sanity.patch implement-flush_work_keventd.patch flush_workqueue-use-preempt_disable-to-hold-off-cpu-hotplug.patch aio-use-flush_work.patch kblockd-use-flush_work.patch relayfs-use-flush_keventd_work.patch tg3-use-flush_keventd_work.patch e1000-use-flush_keventd_work.patch libata-use-flush_work.patch phy-use-flush_work.patch extend-notifier_call_chain-to-count-nr_calls-made.patch eliminate-lock_cpu_hotplug-in-kernel-schedc.patch move-page-writeback-acounting-out-of-macros.patch per-backing_dev-dirty-and-writeback-page-accounting.patch ext2-reservations.patch edac-new-opteron-athlon64-memory-controller-driver.patch aio-is-unlikely.patch mm-implement-swap-prefetching.patch rcu-preemptible-rcu.patch readahead-kconfig-options.patch readahead-minmax_ra_pages.patch readahead-sysctl-parameters.patch readahead-context-based-method.patch readahead-call-scheme.patch readahead-nfsd-case.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch reiser4.patch reiser4-vs-zoned-allocator.patch reiser4-temp-fix.patch reiser4-kmem_cache_t-removal.patch reiser4-test_clear_page_dirty.patch statistics-infrastructure-fix-buffer-overflow-in-histogram-with-linear-tidy.patch slim-main-include-fix.patch nr_blockdev_pages-in_interrupt-warning.patch device-suspend-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch vdso-print-fatal-signals-use-ctl_unnumbered.patch restore-rogue-readahead-printk.patch put_bh-debug.patch e1000-printk-warning-fixes.patch acpi_format_exception-debug.patch add-debugging-aid-for-memory-initialisation-problems-fix.patch kmap_atomic-debugging.patch shrink_slab-handle-bad-shrinkers.patch ia64-enable-config_debug_spinlock_sleep.patch squash-ipc-warnings.patch squash-udf-warnings.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