diff options
| author |   Tyler Hicks <code@tyhicks.com> | 2021-04-19 04:39:17 +0000 |
|---|---|---|
| committer | Tyler Hicks <code@tyhicks.com> | 2021-04-19 04:39:17 +0000 |
| commit | b7f8f259896f669f131713b0c74ba4d008daa71d (patch) | |
| tree | cb42f2b5e67674b011fcca54594213f43c086e8b /include/linux/xarray.h | |
| parent | ecryptfs: use DEFINE_MUTEX() for mutex lock (diff) | |
| parent | Linux 5.12-rc7 (diff) | |
Merge tag 'v5.12-rc7' into ecryptfs/next
Required to pick up idmapped mount changes which changed some function
parameters.
Diffstat (limited to 'include/linux/xarray.h')
| -rw-r--r-- | include/linux/xarray.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 92c0160b3352..a91e3d90df8a 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -229,9 +229,10 @@ static inline int xa_err(void *entry) * * This structure is used either directly or via the XA_LIMIT() macro * to communicate the range of IDs that are valid for allocation. - * Two common ranges are predefined for you: + * Three common ranges are predefined for you: * * xa_limit_32b - [0 - UINT_MAX] * * xa_limit_31b - [0 - INT_MAX] + * * xa_limit_16b - [0 - USHRT_MAX] */ struct xa_limit { u32 max; @@ -242,6 +243,7 @@ struct xa_limit { #define xa_limit_32b XA_LIMIT(0, UINT_MAX) #define xa_limit_31b XA_LIMIT(0, INT_MAX) +#define xa_limit_16b XA_LIMIT(0, USHRT_MAX) typedef unsigned __bitwise xa_mark_t; #define XA_MARK_0 ((__force xa_mark_t)0U) |