mirror of
https://github.com/versity/scoutfs.git
synced 2026-02-07 03:00:44 +00:00
generic_fillattr() now wants the request_mask arg from caller.
Since v6.5-rc1-95-g0d72b92883c6, generic_fillattr() asks us to pass through the request_mask from the caller. Since this happened close enough to the MNT_IDMAP change, I'm just triggering the inclusion of the extra arg through it. Signed-off-by: Auke Kok <auke.kok@versity.com>
This commit is contained in:
@@ -384,6 +384,7 @@ int scoutfs_getattr(KC_VFS_NS_DEF
|
||||
SCOUTFS_LKF_REFRESH_INODE, inode, &lock);
|
||||
if (ret == 0) {
|
||||
generic_fillattr(KC_VFS_INIT_NS
|
||||
KC_FILLATTR_REQUEST_MASK
|
||||
inode, stat);
|
||||
scoutfs_unlock(sb, lock, SCOUTFS_LOCK_READ);
|
||||
}
|
||||
|
||||
@@ -297,15 +297,18 @@ typedef unsigned int blk_opf_t;
|
||||
#define KC_VFS_NS_DEF struct mnt_idmap *mnt_idmap,
|
||||
#define KC_VFS_NS mnt_idmap,
|
||||
#define KC_VFS_INIT_NS &nop_mnt_idmap,
|
||||
#define KC_FILLATTR_REQUEST_MASK request_mask,
|
||||
#else
|
||||
#ifdef KC_VFS_METHOD_USER_NAMESPACE_ARG
|
||||
#define KC_VFS_NS_DEF struct user_namespace *mnt_user_ns,
|
||||
#define KC_VFS_NS mnt_user_ns,
|
||||
#define KC_VFS_INIT_NS &init_user_ns,
|
||||
#define KC_FILLATTR_REQUEST_MASK
|
||||
#else
|
||||
#define KC_VFS_NS_DEF
|
||||
#define KC_VFS_NS
|
||||
#define KC_VFS_INIT_NS
|
||||
#define KC_FILLATTR_REQUEST_MASK
|
||||
#endif
|
||||
#endif /* KC_VFS_METHOD_MNT_IDMAP_ARG */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user