diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 22:01:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 22:01:30 -0400 |
| commit | d39dd11c3e6a7af5c20bfac40594db36cf270f42 (patch) | |
| tree | 6384e07fa2f347b286cde9754c4507b5a738ab47 /mm/filemap.c | |
| parent | 30f5b28e7f937608e0407edaa459cc8161de81d9 (diff) | |
| parent | 0b2d0724e26a335cd326eb7ad552c109116a8795 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
fs: simplify iget & friends
fs: pull inode->i_lock up out of writeback_single_inode
fs: rename inode_lock to inode_hash_lock
fs: move i_wb_list out from under inode_lock
fs: move i_sb_list out from under inode_lock
fs: remove inode_lock from iput_final and prune_icache
fs: Lock the inode LRU list separately
fs: factor inode disposal
fs: protect inode->i_state with inode->i_lock
autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
autofs4 - remove autofs4_lock
autofs4 - fix d_manage() return on rcu-walk
autofs4 - fix autofs4_expire_indirect() traversal
autofs4 - fix dentry leak in autofs4_expire_direct()
autofs4 - reinstate last used update on access
vfs - check non-mountpoint dentry might block in __follow_mount_rcu()
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 04d1992fd86b..c641edf553a9 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -80,8 +80,8 @@ | |||
| 80 | * ->i_mutex | 80 | * ->i_mutex |
| 81 | * ->i_alloc_sem (various) | 81 | * ->i_alloc_sem (various) |
| 82 | * | 82 | * |
| 83 | * ->inode_lock | 83 | * inode_wb_list_lock |
| 84 | * ->sb_lock (fs/fs-writeback.c) | 84 | * sb_lock (fs/fs-writeback.c) |
| 85 | * ->mapping->tree_lock (__sync_single_inode) | 85 | * ->mapping->tree_lock (__sync_single_inode) |
| 86 | * | 86 | * |
| 87 | * ->i_mmap_lock | 87 | * ->i_mmap_lock |
| @@ -98,8 +98,10 @@ | |||
| 98 | * ->zone.lru_lock (check_pte_range->isolate_lru_page) | 98 | * ->zone.lru_lock (check_pte_range->isolate_lru_page) |
| 99 | * ->private_lock (page_remove_rmap->set_page_dirty) | 99 | * ->private_lock (page_remove_rmap->set_page_dirty) |
| 100 | * ->tree_lock (page_remove_rmap->set_page_dirty) | 100 | * ->tree_lock (page_remove_rmap->set_page_dirty) |
| 101 | * ->inode_lock (page_remove_rmap->set_page_dirty) | 101 | * inode_wb_list_lock (page_remove_rmap->set_page_dirty) |
| 102 | * ->inode_lock (zap_pte_range->set_page_dirty) | 102 | * ->inode->i_lock (page_remove_rmap->set_page_dirty) |
| 103 | * inode_wb_list_lock (zap_pte_range->set_page_dirty) | ||
| 104 | * ->inode->i_lock (zap_pte_range->set_page_dirty) | ||
| 103 | * ->private_lock (zap_pte_range->__set_page_dirty_buffers) | 105 | * ->private_lock (zap_pte_range->__set_page_dirty_buffers) |
| 104 | * | 106 | * |
| 105 | * (code doesn't rely on that order, so you could switch it around) | 107 | * (code doesn't rely on that order, so you could switch it around) |