From: Matthew Wilcox
Remove the address_space ->tree_lock and use the xa_lock newly added to
the radix_tree_root. Rename the address_space ->page_tree to ->i_pages,
since we don't really care that it's a tree.
Signed-off-by: Matthew Wilcox
Acked-by: Jeff Layton
---
Documentation/cgroup-v1/memory.txt | 2 +-
Documentation/vm/page_migration | 14 +--
arch/arm/include/asm/cacheflush.h | 6 +-
arch/nds32/include/asm/cacheflush.h | 4 +-
arch/nios2/include/asm/cacheflush.h | 6 +-
arch/parisc/include/asm/cacheflush.h| 6 +-
drivers/staging/lustre/lustre/llite/glimpse.c | 2 +-
drivers/staging/lustre/lustre/mdc/mdc_request.c | 8 +-
fs/afs/write.c | 9 +-
fs/btrfs/compression.c | 2 +-
fs/btrfs/extent_io.c| 16 +--
fs/buffer.c | 13 ++-
fs/cifs/file.c | 9 +-
fs/dax.c| 126
fs/f2fs/data.c | 6 +-
fs/f2fs/dir.c | 6 +-
fs/f2fs/inline.c| 6 +-
fs/f2fs/node.c | 8 +-
fs/fs-writeback.c | 22 ++---
fs/inode.c | 11 +--
fs/nilfs2/btnode.c | 20 ++--
fs/nilfs2/page.c| 22 ++---
include/linux/backing-dev.h | 14 +--
include/linux/fs.h | 8 +-
include/linux/mm.h | 2 +-
include/linux/pagemap.h | 4 +-
mm/filemap.c| 84
mm/huge_memory.c| 10 +-
mm/khugepaged.c | 49 +
mm/memcontrol.c | 4 +-
mm/memfd.c | 18 ++--
mm/migrate.c| 32 +++---
mm/page-writeback.c | 43
mm/readahead.c | 2 +-
mm/rmap.c | 4 +-
mm/shmem.c | 42
mm/swap_state.c | 17 ++--
mm/truncate.c | 22 ++---
mm/vmscan.c | 12 +--
mm/workingset.c | 22 ++---
40 files changed, 346 insertions(+), 367 deletions(-)
diff --git a/Documentation/cgroup-v1/memory.txt
b/Documentation/cgroup-v1/memory.txt
index a4af2e124e24..3682e99234c2 100644
--- a/Documentation/cgroup-v1/memory.txt
+++ b/Documentation/cgroup-v1/memory.txt
@@ -262,7 +262,7 @@ When oom event notifier is registered, event will be
delivered.
2.6 Locking
lock_page_cgroup()/unlock_page_cgroup() should not be called under
- mapping->tree_lock.
+ the i_pages lock.
Other lock order is following:
PG_locked.
diff --git a/Documentation/vm/page_migration b/Documentation/vm/page_migration
index 0478ae2ad44a..496868072e24 100644
--- a/Documentation/vm/page_migration
+++ b/Documentation/vm/page_migration
@@ -90,7 +90,7 @@ Steps:
1. Lock the page to be migrated
-2. Insure that writeback is complete.
+2. Ensure that writeback is complete.
3. Lock the new page that we want to move to. It is locked so that accesses to
this (not yet uptodate) page immediately lock while the move is in progress.
@@ -100,8 +100,8 @@ Steps:
mapcount is not zero then we do not migrate the page. All user space
processes that attempt to access the page will now wait on the page lock.
-5. The radix tree lock is taken. This will cause all processes trying
- to access the page via the mapping to block on the radix tree spinlock.
+5. The i_pages lock is taken. This will cause all processes trying
+ to access the page via the mapping to block on the spinlock.
6. The refcount of the page is examined and we back out if references remain
otherwise we know that we are the only one referencing this page.
@@ -114,12 +114,12 @@ Steps:
9. The radix tree is changed to point to the new page.
-10. The reference count of the old page is dropped because the radix tree
+10. The reference count of the old page is dropped because the address space
reference is gone. A reference to the new page is established because
-the new page is referenced to by the radix tree.
+the new page is referenced by the address space.
-11. The radix tree lock is dropped. With that lookups in the mapping
-become possible again. Processes will move from spinning on the tree_lock
+11. The i_pages lock is dropped. With that lookups in the mapping
+become possible again. Processes wi
