NFS: Fix mode bits and nlink count for v4 referral dirs
Subsystems (2)
PATCH 1/1 NFS: Fix mode bits and nlink count for v4 referral dirs
Request for mode bits and nlink count in the nfs4_get_referral call and if server returns them use them instead of hard coded values.
Signed-off-by Ashish Sangwan <[email protected]>
--- fs/nfs/nfs4proc.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
fs/nfs/nfs4proc.c +17 -3
@@ -266,7 +266,9 @@ const u32 nfs4_fs_locations_bitmap[3] = { | FATTR4_WORD0_FSID |FATTR4_WORD0_FILEID |FATTR4_WORD0_FS_LOCATIONS , -FATTR4_WORD1_OWNER +FATTR4_WORD1_MODE + |FATTR4_WORD1_NUMLINKS + |FATTR4_WORD1_OWNER |FATTR4_WORD1_OWNER_GROUP |FATTR4_WORD1_RAWDEV |FATTR4_WORD1_SPACE_USED
@@ -7594,16 +7596,28 @@ nfs4_listxattr_nfs4_user(struct inode *inode, char *list, size_t list_len)*/ static void nfs_fixup_referral_attributes (struct nfs_fattr *fattr) { +bool fix_mode = true, fix_nlink = true; +if (!(((fattr->valid &NFS_ATTR_FATTR_MOUNTED_ON_FILEID ) || (fattr->valid &NFS_ATTR_FATTR_FILEID )) && (fattr->valid &NFS_ATTR_FATTR_FSID ) && (fattr->valid &NFS_ATTR_FATTR_V4_LOCATIONS )))return ; +if (fattr->valid &NFS_ATTR_FATTR_MODE ) + fix_mode = false; +if (fattr->valid &NFS_ATTR_FATTR_NLINK ) + fix_nlink = false; fattr->valid |=NFS_ATTR_FATTR_TYPE |NFS_ATTR_FATTR_MODE |NFS_ATTR_FATTR_NLINK |NFS_ATTR_FATTR_V4_REFERRAL ; - fattr->mode =S_IFDIR |S_IRUGO |S_IXUGO ; - fattr->nlink =2 ; + +if (fix_mode) + fattr->mode =S_IFDIR |S_IRUGO |S_IXUGO ; +else + fattr->mode |=S_IFDIR ; + +if (fix_nlink) + fattr->nlink =2 ; } static int _nfs4_proc_fs_locations(struct rpc_clnt *client, struct inode *dir,
Signature · 1 line
2.22.0