aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/nfs4_fs.h2
-rw-r--r--fs/nfs/nfs4proc.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 6c028e734fe6..d2802b1ca3b9 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -182,7 +182,7 @@ extern int nfs4_do_close(struct path *path, struct nfs4_state *state);
182extern struct dentry *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *); 182extern struct dentry *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);
183extern int nfs4_open_revalidate(struct inode *, struct dentry *, int, struct nameidata *); 183extern int nfs4_open_revalidate(struct inode *, struct dentry *, int, struct nameidata *);
184extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle); 184extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle);
185extern int nfs4_proc_fs_locations(struct inode *dir, struct qstr *name, 185extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,
186 struct nfs4_fs_locations *fs_locations, struct page *page); 186 struct nfs4_fs_locations *fs_locations, struct page *page);
187 187
188extern struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops; 188extern struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops;
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 8799b1d54a0d..5f3689befc22 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1565,7 +1565,7 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
1565 * Note that we'll actually follow the referral later when 1565 * Note that we'll actually follow the referral later when
1566 * we detect fsid mismatch in inode revalidation 1566 * we detect fsid mismatch in inode revalidation
1567 */ 1567 */
1568static int nfs4_get_referral(struct inode *dir, struct qstr *name, struct nfs_fattr *fattr, struct nfs_fh *fhandle) 1568static int nfs4_get_referral(struct inode *dir, const struct qstr *name, struct nfs_fattr *fattr, struct nfs_fh *fhandle)
1569{ 1569{
1570 int status = -ENOMEM; 1570 int status = -ENOMEM;
1571 struct page *page = NULL; 1571 struct page *page = NULL;
@@ -1680,8 +1680,8 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
1680 return status; 1680 return status;
1681} 1681}
1682 1682
1683static int _nfs4_proc_lookupfh(struct nfs_server *server, struct nfs_fh *dirfh, 1683static int _nfs4_proc_lookupfh(struct nfs_server *server, const struct nfs_fh *dirfh,
1684 struct qstr *name, struct nfs_fh *fhandle, 1684 const struct qstr *name, struct nfs_fh *fhandle,
1685 struct nfs_fattr *fattr) 1685 struct nfs_fattr *fattr)
1686{ 1686{
1687 int status; 1687 int status;
@@ -1727,7 +1727,7 @@ static int nfs4_proc_lookupfh(struct nfs_server *server, struct nfs_fh *dirfh,
1727 return err; 1727 return err;
1728} 1728}
1729 1729
1730static int _nfs4_proc_lookup(struct inode *dir, struct qstr *name, 1730static int _nfs4_proc_lookup(struct inode *dir, const struct qstr *name,
1731 struct nfs_fh *fhandle, struct nfs_fattr *fattr) 1731 struct nfs_fh *fhandle, struct nfs_fattr *fattr)
1732{ 1732{
1733 int status; 1733 int status;
@@ -3684,7 +3684,7 @@ ssize_t nfs4_listxattr(struct dentry *dentry, char *buf, size_t buflen)
3684 return len; 3684 return len;
3685} 3685}
3686 3686
3687int nfs4_proc_fs_locations(struct inode *dir, struct qstr *name, 3687int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,
3688 struct nfs4_fs_locations *fs_locations, struct page *page) 3688 struct nfs4_fs_locations *fs_locations, struct page *page)
3689{ 3689{
3690 struct nfs_server *server = NFS_SERVER(dir); 3690 struct nfs_server *server = NFS_SERVER(dir);