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 /include | |
| parent | 0839c537628df5a3b713d0f619b2dcc8469f08c0 (diff) | |
| parent | 12fd2aee6db765ab4e97c4a37e6d1f6c10e74ee6 (diff) | |
| download | linux-01305db842e1e637944090a3de7e4259c4a3a029.tar.bz2 | |
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 'include')
| -rw-r--r-- | include/linux/xarray.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 0e01e6129145..5921599b6dc4 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -265,6 +265,7 @@ enum xa_lock_type { #define XA_FLAGS_TRACK_FREE ((__force gfp_t)4U) #define XA_FLAGS_ZERO_BUSY ((__force gfp_t)8U) #define XA_FLAGS_ALLOC_WRAPPED ((__force gfp_t)16U) +#define XA_FLAGS_ACCOUNT ((__force gfp_t)32U) #define XA_FLAGS_MARK(mark) ((__force gfp_t)((1U << __GFP_BITS_SHIFT) << \ (__force unsigned)(mark))) |