The patch titled mm: document tree_lock->zone.lock lockorder has been added to the -mm tree. Its filename is mm-document-tree_lock-zonelock-lockorder.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: mm: document tree_lock->zone.lock lockorder From: Nick Piggin <npiggin@xxxxxxx> zone->lock is quite an "inner" lock and mostly constrained to page alloc as well, so like slab locks, it probably isn't something that is critically important to document here. However unlike slab locks, zone lock could be used more widely in future, and page_alloc.c might possibly have more business to do tricky things with pagecache than does slab. So... I don't think it hurts to document it. Signed-off-by: Nick Piggin <npiggin@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN mm/filemap.c~mm-document-tree_lock-zonelock-lockorder mm/filemap.c --- a/mm/filemap.c~mm-document-tree_lock-zonelock-lockorder +++ a/mm/filemap.c @@ -63,6 +63,7 @@ generic_file_direct_IO(int rw, struct ki * ->private_lock (__free_pte->__set_page_dirty_buffers) * ->swap_lock (exclusive_swap_page, others) * ->mapping->tree_lock + * ->zone.lock * * ->i_mutex * ->i_mmap_lock (truncate->unmap_mapping_range) diff -puN mm/rmap.c~mm-document-tree_lock-zonelock-lockorder mm/rmap.c --- a/mm/rmap.c~mm-document-tree_lock-zonelock-lockorder +++ a/mm/rmap.c @@ -36,6 +36,7 @@ * mapping->tree_lock (widely used, in set_page_dirty, * in arch-dependent flush_dcache_mmap_lock, * within inode_lock in __sync_single_inode) + * zone->lock (within radix tree node alloc) */ #include <linux/mm.h> _ Patches currently in -mm which might be from npiggin@xxxxxxx are remove-zero_page.patch mm-use-lockless-radix-tree-probe.patch mm-improve-find_lock_page.patch mm-clarify-__add_to_swap_cache-locking.patch radix-tree-use-indirect-bit.patch calculation-of-pgoff-in-do_linear_fault-uses-mixed.patch fs-fix-nobh-error-handling.patch fix-the-max-path-calculation-in-radix-treec-update.patch mm-revert-kernel_ds-buffered-write-optimisation.patch revert-81b0c8713385ce1b1b9058e916edcf9561ad76d6.patch revert-6527c2bdf1f833cc18e8f42bd97973d583e4aa83.patch mm-clean-up-buffered-write-code.patch mm-debug-write-deadlocks.patch mm-trim-more-holes.patch mm-buffered-write-cleanup.patch mm-write-iovec-cleanup.patch mm-fix-pagecache-write-deadlocks.patch mm-buffered-write-iterator.patch fs-fix-data-loss-on-error.patch fs-introduce-write_begin-write_end-and-perform_write-aops.patch introduce-write_begin-write_end-aops-important-fix.patch introduce-write_begin-write_end-aops-fix2.patch mm-restore-kernel_ds-optimisations.patch implement-simple-fs-aops.patch implement-simple-fs-aops-fix.patch block_dev-convert-to-new-aops.patch ext2-convert-to-new-aops.patch ext2-convert-to-new-aops-fix.patch ext2-convert-to-new-aops-fix2.patch ext3-convert-to-new-aops.patch ext3-convert-to-new-aops-fix.patch ext3-convert-to-new-aops-fix-fix.patch ext4-convert-to-new-aops.patch ext4-convert-to-new-aops-fix.patch ext4-convert-to-new-aops-fix-fix.patch xfs-convert-to-new-aops.patch gfs2-convert-to-new-aops-fix.patch fs-new-cont-helpers.patch fat-convert-to-new-aops.patch hfs-convert-to-new-aops.patch hfsplus-convert-to-new-aops.patch hpfs-convert-to-new-aops.patch bfs-convert-to-new-aops.patch qnx4-convert-to-new-aops.patch reiserfs-use-generic-write.patch reiserfs-convert-to-new-aops.patch reiserfs-convert-to-new-aops-fix.patch reiserfs-convert-to-new-aops-fix2.patch reiserfs-use-generic_cont_expand_simple.patch with-reiserfs-no-longer-using-the-weird-generic_cont_expand-remove-it-completely.patch nfs-convert-to-new-aops.patch smb-convert-to-new-aops.patch fuse-convert-to-new-aops.patch hostfs-convert-to-new-aops.patch hostfs-convert-to-new-aops-fix.patch hostfs-convert-to-new-aops-fix-fix.patch jffs2-convert-to-new-aops.patch ufs-convert-to-new-aops.patch ufs-convert-to-new-aops-fix.patch ufs-convert-to-new-aops-fix2.patch udf-convert-to-new-aops.patch udf-convert-to-new-aops-fix.patch sysv-convert-to-new-aops.patch sysv-convert-to-new-aops-fix.patch sysv-convert-to-new-aops-fix2.patch minix-convert-to-new-aops.patch minix-convert-to-new-aops-fix.patch minix-convert-to-new-aops-fix2.patch jfs-convert-to-new-aops.patch fs-adfs-convert-to-new-aops.patch fs-affs-convert-to-new-aops.patch affs-convert-to-new-aops-fix.patch affs-convert-to-new-aops-fix-fix.patch ocfs2-convert-to-new-aops.patch fs-remove-some-aop_truncated_page.patch make-swappiness-safer-to-use.patch mm-document-tree_lock-zonelock-lockorder.patch fs-reiserfs-cleanups.patch atomic_opstxt-has-incorrect-misleading-and-insufficient-information.patch fs-introduce-write_begin-write_end-and-perform_write-aops-revoke.patch fs-introduce-write_begin-write_end-and-perform_write-aops-revoke-fix.patch bitops-introduce-lock-ops.patch alpha-fix-bitops.patch alpha-lock-bitops.patch alpha-lock-bitops-fix.patch ia64-lock-bitops.patch mips-fix-bitops.patch mips-lock-bitops.patch powerpc-lock-bitops.patch powerpc-lock-bitops-fix.patch bit_spin_lock-use-lock-bitops.patch reiser4-fix-for-new-aops-patches.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