diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-29 17:14:57 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-29 17:14:57 +0800 |
| commit | 01305db842e1e637944090a3de7e4259c4a3a029 (patch) | |
| tree | eab0952f853d209e0ad964d74f998ae5e5df85e7 /fs | |
| parent | 0839c537628df5a3b713d0f619b2dcc8469f08c0 (diff) | |
| parent | 12fd2aee6db765ab4e97c4a37e6d1f6c10e74ee6 (diff) | |
| download | linux-01305db842e1e637944090a3de7e4259c4a3a029.tar.gz linux-01305db842e1e637944090a3de7e4259c4a3a029.tar.bz2 linux-01305db842e1e637944090a3de7e4259c4a3a029.zip | |
Merge tag 'xarray-5.2-rc6' of git://git.infradead.org/users/willy/linux-dax
Pull XArray fixes from Matthew Wilcox:
- Account XArray nodes for the page cache to the appropriate cgroup
(Johannes Weiner)
- Fix idr_get_next() when called under the RCU lock (Matthew Wilcox)
- Add a test for xa_insert() (Matthew Wilcox)
* tag 'xarray-5.2-rc6' of git://git.infradead.org/users/willy/linux-dax:
XArray tests: Add check_insert
idr: Fix idr_get_next race with idr_remove
mm: fix page cache convergence regression
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index df6542ec3b88..2bf21e2c90fc 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -362,7 +362,7 @@ EXPORT_SYMBOL(inc_nlink); static void __address_space_init_once(struct address_space *mapping) { - xa_init_flags(&mapping->i_pages, XA_FLAGS_LOCK_IRQ); + xa_init_flags(&mapping->i_pages, XA_FLAGS_LOCK_IRQ | XA_FLAGS_ACCOUNT); init_rwsem(&mapping->i_mmap_rwsem); INIT_LIST_HEAD(&mapping->private_list); spin_lock_init(&mapping->private_lock); |