qstr: constify instances in nfs

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index cb28cce..698be93 100644 (file)
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -144,7 +144,7 @@ nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
 }
 
 static int
 }
 
 static int

-nfs3_proc_lookup(struct inode *dir, struct qstr *name,
+nfs3_proc_lookup(struct inode *dir, const struct qstr *name,

                 struct nfs_fh *fhandle, struct nfs_fattr *fattr,
                 struct nfs4_label *label)
 {
                 struct nfs_fh *fhandle, struct nfs_fattr *fattr,
                 struct nfs4_label *label)
 {


@@ -404,7 +404,7 @@ out:
 }
 
 static int
 }
 
 static int

-nfs3_proc_remove(struct inode *dir, struct qstr *name)
+nfs3_proc_remove(struct inode *dir, const struct qstr *name)

 {
        struct nfs_removeargs arg = {
                .fh = NFS_FH(dir),
 {
        struct nfs_removeargs arg = {
                .fh = NFS_FH(dir),


@@ -480,7 +480,7 @@ nfs3_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
 }
 
 static int
 }
 
 static int

-nfs3_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
+nfs3_proc_link(struct inode *inode, struct inode *dir, const struct qstr *name)

 {
        struct nfs3_linkargs    arg = {
                .fromfh         = NFS_FH(inode),
 {
        struct nfs3_linkargs    arg = {
                .fromfh         = NFS_FH(inode),


@@ -582,7 +582,7 @@ out:
 }
 
 static int
 }
 
 static int

-nfs3_proc_rmdir(struct inode *dir, struct qstr *name)
+nfs3_proc_rmdir(struct inode *dir, const struct qstr *name)

 {
        struct nfs_fattr        *dir_attr;
        struct nfs3_diropargs   arg = {
 {
        struct nfs_fattr        *dir_attr;
        struct nfs3_diropargs   arg = {

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 768456f..81e9385 100644 (file)
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -224,7 +224,8 @@ int nfs_atomic_open(struct inode *, struct dentry *, struct file *,
 extern struct file_system_type nfs4_fs_type;
 
 /* nfs4namespace.c */
 extern struct file_system_type nfs4_fs_type;
 
 /* nfs4namespace.c */

-struct rpc_clnt *nfs4_negotiate_security(struct rpc_clnt *, struct inode *, struct qstr *);
+struct rpc_clnt *nfs4_negotiate_security(struct rpc_clnt *, struct inode *,
+                                        const struct qstr *);

 struct vfsmount *nfs4_submount(struct nfs_server *, struct dentry *,
                               struct nfs_fh *, struct nfs_fattr *);
 int nfs4_replace_transport(struct nfs_server *server,
 struct vfsmount *nfs4_submount(struct nfs_server *, struct dentry *,
                               struct nfs_fh *, struct nfs_fattr *);
 int nfs4_replace_transport(struct nfs_server *server,


@@ -251,7 +252,7 @@ extern int nfs4_proc_fs_locations(struct rpc_clnt *, struct inode *, const struc
 extern int nfs4_proc_get_locations(struct inode *, struct nfs4_fs_locations *,
                struct page *page, struct rpc_cred *);
 extern int nfs4_proc_fsid_present(struct inode *, struct rpc_cred *);
 extern int nfs4_proc_get_locations(struct inode *, struct nfs4_fs_locations *,
                struct page *page, struct rpc_cred *);
 extern int nfs4_proc_fsid_present(struct inode *, struct rpc_cred *);

-extern struct rpc_clnt *nfs4_proc_lookup_mountpoint(struct inode *, struct qstr *,
+extern struct rpc_clnt *nfs4_proc_lookup_mountpoint(struct inode *, const struct qstr *,

                            struct nfs_fh *, struct nfs_fattr *);
 extern int nfs4_proc_secinfo(struct inode *, const struct qstr *, struct nfs4_secinfo_flavors *);
 extern const struct xattr_handler *nfs4_xattr_handlers[];
                            struct nfs_fh *, struct nfs_fattr *);
 extern int nfs4_proc_secinfo(struct inode *, const struct qstr *, struct nfs4_secinfo_flavors *);
 extern const struct xattr_handler *nfs4_xattr_handlers[];

diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index f592672..d211049 100644 (file)
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -208,7 +208,7 @@ static struct rpc_clnt *nfs_find_best_sec(struct rpc_clnt *clnt,
  */
 struct rpc_clnt *
 nfs4_negotiate_security(struct rpc_clnt *clnt, struct inode *inode,
  */
 struct rpc_clnt *
 nfs4_negotiate_security(struct rpc_clnt *clnt, struct inode *inode,

-                                       struct qstr *name)
+                                       const struct qstr *name)

 {
        struct page *page;
        struct nfs4_secinfo_flavors *flavors;
 {
        struct page *page;
        struct nfs4_secinfo_flavors *flavors;


@@ -397,7 +397,7 @@ struct vfsmount *nfs4_submount(struct nfs_server *server, struct dentry *dentry,
        rpc_authflavor_t flavor = server->client->cl_auth->au_flavor;
        struct dentry *parent = dget_parent(dentry);
        struct inode *dir = d_inode(parent);
        rpc_authflavor_t flavor = server->client->cl_auth->au_flavor;
        struct dentry *parent = dget_parent(dentry);
        struct inode *dir = d_inode(parent);

-       struct qstr *name = &dentry->d_name;
+       const struct qstr *name = &dentry->d_name;

        struct rpc_clnt *client;
        struct vfsmount *mnt;
 
        struct rpc_clnt *client;
        struct vfsmount *mnt;
 

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ff416d0..e75815c 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3530,7 +3530,7 @@ static void nfs_fixup_secinfo_attributes(struct nfs_fattr *fattr)
 }
 
 static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir,
 }
 
 static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir,

-                                  struct qstr *name, struct nfs_fh *fhandle,
+                                  const struct qstr *name, struct nfs_fh *fhandle,

                                   struct nfs_fattr *fattr, struct nfs4_label *label)
 {
        struct nfs4_exception exception = { };
                                   struct nfs_fattr *fattr, struct nfs4_label *label)
 {
        struct nfs4_exception exception = { };


@@ -3572,7 +3572,7 @@ out:
        return err;
 }
 
        return err;
 }
 

-static int nfs4_proc_lookup(struct inode *dir, struct qstr *name,
+static int nfs4_proc_lookup(struct inode *dir, const struct qstr *name,

                            struct nfs_fh *fhandle, struct nfs_fattr *fattr,
                            struct nfs4_label *label)
 {
                            struct nfs_fh *fhandle, struct nfs_fattr *fattr,
                            struct nfs4_label *label)
 {


@@ -3588,7 +3588,7 @@ static int nfs4_proc_lookup(struct inode *dir, struct qstr *name,
 }
 
 struct rpc_clnt *
 }
 
 struct rpc_clnt *

-nfs4_proc_lookup_mountpoint(struct inode *dir, struct qstr *name,
+nfs4_proc_lookup_mountpoint(struct inode *dir, const struct qstr *name,

                            struct nfs_fh *fhandle, struct nfs_fattr *fattr)
 {
        struct rpc_clnt *client = NFS_CLIENT(dir);
                            struct nfs_fh *fhandle, struct nfs_fattr *fattr)
 {
        struct rpc_clnt *client = NFS_CLIENT(dir);


@@ -3747,7 +3747,7 @@ out:
        return status;
 }
 
        return status;
 }
 

-static int _nfs4_proc_remove(struct inode *dir, struct qstr *name)
+static int _nfs4_proc_remove(struct inode *dir, const struct qstr *name)

 {
        struct nfs_server *server = NFS_SERVER(dir);
        struct nfs_removeargs args = {
 {
        struct nfs_server *server = NFS_SERVER(dir);
        struct nfs_removeargs args = {


@@ -3770,7 +3770,7 @@ static int _nfs4_proc_remove(struct inode *dir, struct qstr *name)
        return status;
 }
 
        return status;
 }
 

-static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
+static int nfs4_proc_remove(struct inode *dir, const struct qstr *name)

 {
        struct nfs4_exception exception = { };
        int err;
 {
        struct nfs4_exception exception = { };
        int err;


@@ -3853,7 +3853,7 @@ static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
        return 1;
 }
 
        return 1;
 }
 

-static int _nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
+static int _nfs4_proc_link(struct inode *inode, struct inode *dir, const struct qstr *name)

 {
        struct nfs_server *server = NFS_SERVER(inode);
        struct nfs4_link_arg arg = {
 {
        struct nfs_server *server = NFS_SERVER(inode);
        struct nfs4_link_arg arg = {


@@ -3900,7 +3900,7 @@ out:
        return status;
 }
 
        return status;
 }
 

-static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
+static int nfs4_proc_link(struct inode *inode, struct inode *dir, const struct qstr *name)

 {
        struct nfs4_exception exception = { };
        int err;
 {
        struct nfs4_exception exception = { };
        int err;


@@ -3922,7 +3922,7 @@ struct nfs4_createdata {
 };
 
 static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir,
 };
 
 static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir,

-               struct qstr *name, struct iattr *sattr, u32 ftype)
+               const struct qstr *name, struct iattr *sattr, u32 ftype)

 {
        struct nfs4_createdata *data;
 
 {
        struct nfs4_createdata *data;
 

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index b417bbc..b7bca83 100644 (file)
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -145,7 +145,7 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
 }
 
 static int
 }
 
 static int

-nfs_proc_lookup(struct inode *dir, struct qstr *name,
+nfs_proc_lookup(struct inode *dir, const struct qstr *name,

                struct nfs_fh *fhandle, struct nfs_fattr *fattr,
                struct nfs4_label *label)
 {
                struct nfs_fh *fhandle, struct nfs_fattr *fattr,
                struct nfs4_label *label)
 {


@@ -299,7 +299,7 @@ out:
 }
   
 static int
 }
   
 static int

-nfs_proc_remove(struct inode *dir, struct qstr *name)
+nfs_proc_remove(struct inode *dir, const struct qstr *name)

 {
        struct nfs_removeargs arg = {
                .fh = NFS_FH(dir),
 {
        struct nfs_removeargs arg = {
                .fh = NFS_FH(dir),


@@ -357,7 +357,7 @@ nfs_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
 }
 
 static int
 }
 
 static int

-nfs_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
+nfs_proc_link(struct inode *inode, struct inode *dir, const struct qstr *name)

 {
        struct nfs_linkargs     arg = {
                .fromfh         = NFS_FH(inode),
 {
        struct nfs_linkargs     arg = {
                .fromfh         = NFS_FH(inode),


@@ -456,7 +456,7 @@ out:
 }
 
 static int
 }
 
 static int

-nfs_proc_rmdir(struct inode *dir, struct qstr *name)
+nfs_proc_rmdir(struct inode *dir, const struct qstr *name)

 {
        struct nfs_diropargs    arg = {
                .fh             = NFS_FH(dir),
 {
        struct nfs_diropargs    arg = {
                .fh             = NFS_FH(dir),

diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 1868246..191aa57 100644 (file)
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -162,7 +162,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
  * @dentry: dentry to unlink
  */
 static int
  * @dentry: dentry to unlink
  */
 static int

-nfs_async_unlink(struct dentry *dentry, struct qstr *name)
+nfs_async_unlink(struct dentry *dentry, const struct qstr *name)

 {
        struct nfs_unlinkdata *data;
        int status = -ENOMEM;
 {
        struct nfs_unlinkdata *data;
        int status = -ENOMEM;

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index c304a11..890b4ab 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1543,7 +1543,7 @@ struct nfs_rpc_ops {
                            struct nfs_fattr *, struct nfs4_label *);
        int     (*setattr) (struct dentry *, struct nfs_fattr *,
                            struct iattr *);
                            struct nfs_fattr *, struct nfs4_label *);
        int     (*setattr) (struct dentry *, struct nfs_fattr *,
                            struct iattr *);

-       int     (*lookup)  (struct inode *, struct qstr *,
+       int     (*lookup)  (struct inode *, const struct qstr *,

                            struct nfs_fh *, struct nfs_fattr *,
                            struct nfs4_label *);
        int     (*access)  (struct inode *, struct nfs_access_entry *);
                            struct nfs_fh *, struct nfs_fattr *,
                            struct nfs4_label *);
        int     (*access)  (struct inode *, struct nfs_access_entry *);


@@ -1551,18 +1551,18 @@ struct nfs_rpc_ops {
                            unsigned int);
        int     (*create)  (struct inode *, struct dentry *,
                            struct iattr *, int);
                            unsigned int);
        int     (*create)  (struct inode *, struct dentry *,
                            struct iattr *, int);

-       int     (*remove)  (struct inode *, struct qstr *);
+       int     (*remove)  (struct inode *, const struct qstr *);

        void    (*unlink_setup)  (struct rpc_message *, struct inode *dir);
        void    (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *);
        int     (*unlink_done) (struct rpc_task *, struct inode *);
        void    (*rename_setup)  (struct rpc_message *msg, struct inode *dir);
        void    (*rename_rpc_prepare)(struct rpc_task *task, struct nfs_renamedata *);
        int     (*rename_done) (struct rpc_task *task, struct inode *old_dir, struct inode *new_dir);
        void    (*unlink_setup)  (struct rpc_message *, struct inode *dir);
        void    (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *);
        int     (*unlink_done) (struct rpc_task *, struct inode *);
        void    (*rename_setup)  (struct rpc_message *msg, struct inode *dir);
        void    (*rename_rpc_prepare)(struct rpc_task *task, struct nfs_renamedata *);
        int     (*rename_done) (struct rpc_task *task, struct inode *old_dir, struct inode *new_dir);

-       int     (*link)    (struct inode *, struct inode *, struct qstr *);
+       int     (*link)    (struct inode *, struct inode *, const struct qstr *);

        int     (*symlink) (struct inode *, struct dentry *, struct page *,
                            unsigned int, struct iattr *);
        int     (*mkdir)   (struct inode *, struct dentry *, struct iattr *);
        int     (*symlink) (struct inode *, struct dentry *, struct page *,
                            unsigned int, struct iattr *);
        int     (*mkdir)   (struct inode *, struct dentry *, struct iattr *);

-       int     (*rmdir)   (struct inode *, struct qstr *);
+       int     (*rmdir)   (struct inode *, const struct qstr *);

        int     (*readdir) (struct dentry *, struct rpc_cred *,
                            u64, struct page **, unsigned int, int);
        int     (*mknod)   (struct inode *, struct dentry *, struct iattr *,
        int     (*readdir) (struct dentry *, struct rpc_cred *,
                            u64, struct page **, unsigned int, int);
        int     (*mknod)   (struct inode *, struct dentry *, struct iattr *,