The patch titled
throttle-writers-of-shared-mappings-tidy
has been removed from the -mm tree. Its filename is
throttle-writers-of-shared-mappings-tidy.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
------------------------------------------------------
Subject: throttle-writers-of-shared-mappings-tidy
From: Andrew Morton <akpm@xxxxxxxx>
- We don't need to use balance_dirty_pages_nr().
- Don't run balance_dirty_pages() if the page was already dirty.
- Consolidate it into a helper function.
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/writeback.h | 1 +
mm/memory.c | 10 ++--------
mm/page-writeback.c | 10 ++++++++++
3 files changed, 13 insertions(+), 8 deletions(-)
diff -puN include/linux/writeback.h~throttle-writers-of-shared-mappings-tidy include/linux/writeback.h
--- devel/include/linux/writeback.h~throttle-writers-of-shared-mappings-tidy 2006-05-17 13:09:45.000000000 -0700
+++ devel-akpm/include/linux/writeback.h 2006-05-17 13:09:45.000000000 -0700
@@ -114,6 +114,7 @@ int sync_page_range(struct inode *inode,
loff_t pos, loff_t count);
int sync_page_range_nolock(struct inode *inode, struct address_space *mapping,
loff_t pos, loff_t count);
+void set_page_dirty_balance(struct page *page);
/* pdflush.c */
extern int nr_pdflush_threads; /* Global so it can be exported to sysctl
diff -puN mm/memory.c~throttle-writers-of-shared-mappings-tidy mm/memory.c
--- devel/mm/memory.c~throttle-writers-of-shared-mappings-tidy 2006-05-17 13:09:45.000000000 -0700
+++ devel-akpm/mm/memory.c 2006-05-17 13:09:45.000000000 -0700
@@ -2164,11 +2164,8 @@ retry:
unlock:
pte_unmap_unlock(page_table, ptl);
if (dirty_page) {
- struct address_space *mapping = page_mapping(dirty_page);
- set_page_dirty(dirty_page);
+ set_page_dirty_balance(dirty_page);
put_page(dirty_page);
- if (mapping)
- balance_dirty_pages_ratelimited_nr(mapping, 1);
}
return ret;
oom:
@@ -2288,11 +2285,8 @@ static inline int handle_pte_fault(struc
unlock:
pte_unmap_unlock(pte, ptl);
if (dirty_page) {
- struct address_space *mapping = page_mapping(dirty_page);
- set_page_dirty(dirty_page);
+ set_page_dirty_balance(dirty_page);
put_page(dirty_page);
- if (mapping)
- balance_dirty_pages_ratelimited_nr(mapping, 1);
}
return VM_FAULT_MINOR;
}
diff -puN mm/page-writeback.c~throttle-writers-of-shared-mappings-tidy mm/page-writeback.c
--- devel/mm/page-writeback.c~throttle-writers-of-shared-mappings-tidy 2006-05-17 13:09:45.000000000 -0700
+++ devel-akpm/mm/page-writeback.c 2006-05-17 13:09:45.000000000 -0700
@@ -255,6 +255,16 @@ static void balance_dirty_pages(struct a
pdflush_operation(background_writeout, 0);
}
+void set_page_dirty_balance(struct page *page)
+{
+ if (set_page_dirty(page)) {
+ struct address_space *mapping = page_mapping(page);
+
+ if (mapping)
+ balance_dirty_pages_ratelimited(mapping);
+ }
+}
+
/**
* balance_dirty_pages_ratelimited_nr - balance dirty memory state
* @mapping: address_space which was dirtied
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
sys_sync_file_range-move-exported-flags-outside-kernel.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
acpi-dock-driver-interface-fixups.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
git-audit-master-build-fix.patch
kauditd_thread-warning-fix.patch
audit-build-fix.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
git-gfs2.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-klibc.patch
git-klibc-build-hacks.patch
git-klibc-stdint-build-fix.patch
git-klibc-stdint-build-fix-2.patch
git-hdrcleanup-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
libata-reduce-timeouts.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
git-mtd-fixup.patch
git-netdev-all.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-nfs-fixup.patch
git-powerpc.patch
powerpc-kbuild-warning-fix.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
kconfigurable-resources-mtd-fixes.patch
qla2xxx-lock-ordering-fix-warning-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-scsi-target-fixup.patch
git-scsi-target-warning-fix.patch
revert-gregkh-usb-usb-ohci-avoids-root-hub-timer-polling.patch
gregkh-usb-usb-serial-mos7720-powerpc-wrokaround.patch
git-supertrak-fixup.patch
x86_64-mm-i386-numa-summit-check-fix.patch
revert-x86_64-mm-profile-pc-fp.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
pgdat-allocation-for-new-node-add-specify-node-id-powerpc-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-specify-node-id-fix-3.patch
pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch
pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch
pgdat-allocation-for-new-node-add-refresh-node_data-fix.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
catch-valid-mem-range-at-onlining-memory-tidy.patch
catch-valid-mem-range-at-onlining-memory-fix.patch
mm-introduce-remap_vmalloc_range-fix.patch
throttle-writers-of-shared-mappings.patch
throttle-writers-of-shared-mappings-tidy.patch
page-migration-simplify-migrate_pages-tweaks.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
x86-kernel-irq-balancer-fix-tidy.patch
move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy.patch
x86-move-vsyscall-page-out-of-fixmap-above-stack-tidy.patch
dont-use-flush_tlb_all-in-suspend-time-tidy.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
percpu-counter-data-type-changes-to-suppport-fix.patch
connector-exports.patch
config_net=n-build-fix.patch
jbd-split-checkpoint-lists-tidy.patch
mark-address_space_operations-const-fix.patch
mark-address_space_operations-const-fix-2.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2.patch
ufs-right-block-allocation-fixes.patch
ufs-change-block-number-on-the-fly-tweaks.patch
sunsu-license-fix.patch
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-driver-for-arm-amba-pl031-rtc-tidy.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
add-a-sysfs-file-to-determine-if-a-kexec-kernel-is-loaded-tidy.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
swap-prefetch-fix-lru_cache_add_tail-tidy.patch
pi-futex-futex-code-cleanups-fix.patch
document-futex-pi-design-fix-fix.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
reiser4.patch
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.patch
git-viro-bird-volatile-fixup.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
