Skip to content

L
linux
Commit beffb8fe authored by Al Viro's avatar Al Viro
Browse files
Options

qstr: constify instances in nfs 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 612645f7
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 25 deletions
fs/nfs/nfs3proc.c
View file @ beffb8fe
...@@ -144,7 +144,7 @@ nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, ...@@ -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 nfs_fh *fhandle, struct nfs_fattr *fattr,
struct nfs4_label *label) struct nfs4_label *label)
{ {
...@@ -404,7 +404,7 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, ...@@ -404,7 +404,7 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
} }
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 = { struct nfs_removeargs arg = {
.fh = NFS_FH(dir), .fh = NFS_FH(dir),
...@@ -480,7 +480,7 @@ nfs3_proc_rename_done(struct rpc_task *task, struct inode *old_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 = { struct nfs3_linkargs arg = {
.fromfh = NFS_FH(inode), .fromfh = NFS_FH(inode),
...@@ -582,7 +582,7 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) ...@@ -582,7 +582,7 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
} }
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 nfs_fattr *dir_attr;
struct nfs3_diropargs arg = { struct nfs3_diropargs arg = {
......
fs/nfs/nfs4_fs.h
View file @ beffb8fe
...@@ -224,7 +224,8 @@ int nfs_atomic_open(struct inode *, struct dentry *, struct file *, ...@@ -224,7 +224,8 @@ int nfs_atomic_open(struct inode *, struct dentry *, struct file *,
extern struct file_system_type nfs4_fs_type; extern struct file_system_type nfs4_fs_type;
/* nfs4namespace.c */ /* 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 vfsmount *nfs4_submount(struct nfs_server *, struct dentry *,
struct nfs_fh *, struct nfs_fattr *); struct nfs_fh *, struct nfs_fattr *);
int nfs4_replace_transport(struct nfs_server *server, 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 ...@@ -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 *, extern int nfs4_proc_get_locations(struct inode *, struct nfs4_fs_locations *,
struct page *page, struct rpc_cred *); struct page *page, struct rpc_cred *);
extern int nfs4_proc_fsid_present(struct inode *, 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 *); struct nfs_fh *, struct nfs_fattr *);
extern int nfs4_proc_secinfo(struct inode *, const struct qstr *, struct nfs4_secinfo_flavors *); extern int nfs4_proc_secinfo(struct inode *, const struct qstr *, struct nfs4_secinfo_flavors *);
extern const struct xattr_handler *nfs4_xattr_handlers[]; extern const struct xattr_handler *nfs4_xattr_handlers[];
......
fs/nfs/nfs4namespace.c
View file @ beffb8fe
...@@ -208,7 +208,7 @@ static struct rpc_clnt *nfs_find_best_sec(struct rpc_clnt *clnt, ...@@ -208,7 +208,7 @@ static struct rpc_clnt *nfs_find_best_sec(struct rpc_clnt *clnt,
*/ */
struct rpc_clnt * struct rpc_clnt *
nfs4_negotiate_security(struct rpc_clnt *clnt, struct inode *inode, nfs4_negotiate_security(struct rpc_clnt *clnt, struct inode *inode,
struct qstr *name) const struct qstr *name)
{ {
struct page *page; struct page *page;
struct nfs4_secinfo_flavors *flavors; struct nfs4_secinfo_flavors *flavors;
...@@ -397,7 +397,7 @@ struct vfsmount *nfs4_submount(struct nfs_server *server, struct dentry *dentry, ...@@ -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; rpc_authflavor_t flavor = server->client->cl_auth->au_flavor;
struct dentry *parent = dget_parent(dentry); struct dentry *parent = dget_parent(dentry);
struct inode *dir = d_inode(parent); struct inode *dir = d_inode(parent);
struct qstr *name = &dentry->d_name; const struct qstr *name = &dentry->d_name;
struct rpc_clnt *client; struct rpc_clnt *client;
struct vfsmount *mnt; struct vfsmount *mnt;
......
fs/nfs/nfs4proc.c
View file @ beffb8fe
...@@ -3530,7 +3530,7 @@ static void nfs_fixup_secinfo_attributes(struct nfs_fattr *fattr) ...@@ -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 nfs_fattr *fattr, struct nfs4_label *label)
{ {
struct nfs4_exception exception = { }; struct nfs4_exception exception = { };
...@@ -3572,7 +3572,7 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir, ...@@ -3572,7 +3572,7 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir,
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 nfs_fh *fhandle, struct nfs_fattr *fattr,
struct nfs4_label *label) struct nfs4_label *label)
{ {
...@@ -3588,7 +3588,7 @@ static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, ...@@ -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 nfs_fh *fhandle, struct nfs_fattr *fattr)
{ {
struct rpc_clnt *client = NFS_CLIENT(dir); struct rpc_clnt *client = NFS_CLIENT(dir);
...@@ -3747,7 +3747,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, ...@@ -3747,7 +3747,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
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_server *server = NFS_SERVER(dir);
struct nfs_removeargs args = { struct nfs_removeargs args = {
...@@ -3770,7 +3770,7 @@ static int _nfs4_proc_remove(struct inode *dir, struct qstr *name) ...@@ -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 = { }; struct nfs4_exception exception = { };
int err; int err;
...@@ -3853,7 +3853,7 @@ static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir, ...@@ -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 nfs_server *server = NFS_SERVER(inode);
struct nfs4_link_arg arg = { struct nfs4_link_arg arg = {
...@@ -3900,7 +3900,7 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr * ...@@ -3900,7 +3900,7 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *
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 = { }; struct nfs4_exception exception = { };
int err; int err;
...@@ -3922,7 +3922,7 @@ struct nfs4_createdata { ...@@ -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;
......
fs/nfs/proc.c
View file @ beffb8fe
...@@ -145,7 +145,7 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, ...@@ -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 nfs_fh *fhandle, struct nfs_fattr *fattr,
struct nfs4_label *label) struct nfs4_label *label)
{ {
...@@ -299,7 +299,7 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, ...@@ -299,7 +299,7 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
} }
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 = { struct nfs_removeargs arg = {
.fh = NFS_FH(dir), .fh = NFS_FH(dir),
...@@ -357,7 +357,7 @@ nfs_proc_rename_done(struct rpc_task *task, struct inode *old_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 = { struct nfs_linkargs arg = {
.fromfh = NFS_FH(inode), .fromfh = NFS_FH(inode),
...@@ -456,7 +456,7 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) ...@@ -456,7 +456,7 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
} }
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 = { struct nfs_diropargs arg = {
.fh = NFS_FH(dir), .fh = NFS_FH(dir),
......
fs/nfs/unlink.c
View file @ beffb8fe
...@@ -162,7 +162,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data) ...@@ -162,7 +162,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
* @dentry: dentry to unlink * @dentry: dentry to unlink
*/ */
static int 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; struct nfs_unlinkdata *data;
int status = -ENOMEM; int status = -ENOMEM;
......
include/linux/nfs_xdr.h
View file @ beffb8fe
...@@ -1543,7 +1543,7 @@ struct nfs_rpc_ops { ...@@ -1543,7 +1543,7 @@ struct nfs_rpc_ops {
struct nfs_fattr *, struct nfs4_label *); struct nfs_fattr *, struct nfs4_label *);
int (*setattr) (struct dentry *, struct nfs_fattr *, int (*setattr) (struct dentry *, struct nfs_fattr *,
struct iattr *); struct iattr *);
int (*lookup) (struct inode *, struct qstr *, int (*lookup) (struct inode *, const struct qstr *,
struct nfs_fh *, struct nfs_fattr *, struct nfs_fh *, struct nfs_fattr *,
struct nfs4_label *); struct nfs4_label *);
int (*access) (struct inode *, struct nfs_access_entry *); int (*access) (struct inode *, struct nfs_access_entry *);
...@@ -1551,18 +1551,18 @@ struct nfs_rpc_ops { ...@@ -1551,18 +1551,18 @@ struct nfs_rpc_ops {
unsigned int); unsigned int);
int (*create) (struct inode *, struct dentry *, int (*create) (struct inode *, struct dentry *,
struct iattr *, int); 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_setup) (struct rpc_message *, struct inode *dir);
void (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *); void (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *);
int (*unlink_done) (struct rpc_task *, struct inode *); int (*unlink_done) (struct rpc_task *, struct inode *);
void (*rename_setup) (struct rpc_message *msg, struct inode *dir); void (*rename_setup) (struct rpc_message *msg, struct inode *dir);
void (*rename_rpc_prepare)(struct rpc_task *task, struct nfs_renamedata *); 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 (*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 *, int (*symlink) (struct inode *, struct dentry *, struct page *,
unsigned int, struct iattr *); unsigned int, struct iattr *);
int (*mkdir) (struct inode *, struct dentry *, 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 *, int (*readdir) (struct dentry *, struct rpc_cred *,
u64, struct page **, unsigned int, int); u64, struct page **, unsigned int, int);
int (*mknod) (struct inode *, struct dentry *, struct iattr *, int (*mknod) (struct inode *, struct dentry *, struct iattr *,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7