aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 54767dd66cf9..281c2def2b19 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -79,6 +79,7 @@ static int _nfs4_proc_open(struct nfs4_opendata *data);
79static int _nfs4_recover_proc_open(struct nfs4_opendata *data); 79static int _nfs4_recover_proc_open(struct nfs4_opendata *data);
80static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *); 80static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
81static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *, struct nfs4_state *); 81static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *, struct nfs4_state *);
82static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr);
82static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr); 83static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr);
83static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred, 84static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
84 struct nfs_fattr *fattr, struct iattr *sattr, 85 struct nfs_fattr *fattr, struct iattr *sattr,
@@ -2340,7 +2341,6 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
2340 return nfs4_map_errors(status); 2341 return nfs4_map_errors(status);
2341} 2342}
2342 2343
2343static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr);
2344/* 2344/*
2345 * Get locations and (maybe) other attributes of a referral. 2345 * Get locations and (maybe) other attributes of a referral.
2346 * Note that we'll actually follow the referral later when 2346 * Note that we'll actually follow the referral later when
@@ -4797,11 +4797,11 @@ static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr)
4797 if (!(((fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID) || 4797 if (!(((fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID) ||
4798 (fattr->valid & NFS_ATTR_FATTR_FILEID)) && 4798 (fattr->valid & NFS_ATTR_FATTR_FILEID)) &&
4799 (fattr->valid & NFS_ATTR_FATTR_FSID) && 4799 (fattr->valid & NFS_ATTR_FATTR_FSID) &&
4800 (fattr->valid & NFS_ATTR_FATTR_V4_REFERRAL))) 4800 (fattr->valid & NFS_ATTR_FATTR_V4_LOCATIONS)))
4801 return; 4801 return;
4802 4802
4803 fattr->valid |= NFS_ATTR_FATTR_TYPE | NFS_ATTR_FATTR_MODE | 4803 fattr->valid |= NFS_ATTR_FATTR_TYPE | NFS_ATTR_FATTR_MODE |
4804 NFS_ATTR_FATTR_NLINK; 4804 NFS_ATTR_FATTR_NLINK | NFS_ATTR_FATTR_V4_REFERRAL;
4805 fattr->mode = S_IFDIR | S_IRUGO | S_IXUGO; 4805 fattr->mode = S_IFDIR | S_IRUGO | S_IXUGO;
4806 fattr->nlink = 2; 4806 fattr->nlink = 2;
4807} 4807}