forked from luck/tmp_suning_uos_patched
qstr: constify instances in nfs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
612645f7cf
commit
beffb8feb6
|
@ -144,7 +144,7 @@ nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
|
|||
}
|
||||
|
||||
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)
|
||||
{
|
||||
|
@ -404,7 +404,7 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
|
|||
}
|
||||
|
||||
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),
|
||||
|
@ -480,7 +480,7 @@ nfs3_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
|
|||
}
|
||||
|
||||
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),
|
||||
|
@ -582,7 +582,7 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
|
|||
}
|
||||
|
||||
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 = {
|
||||
|
|
|
@ -224,7 +224,8 @@ int nfs_atomic_open(struct inode *, struct dentry *, struct file *,
|
|||
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,
|
||||
|
@ -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 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[];
|
||||
|
|
|
@ -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 qstr *name)
|
||||
const struct qstr *name)
|
||||
{
|
||||
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);
|
||||
struct qstr *name = &dentry->d_name;
|
||||
const struct qstr *name = &dentry->d_name;
|
||||
struct rpc_clnt *client;
|
||||
struct vfsmount *mnt;
|
||||
|
||||
|
|
|
@ -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,
|
||||
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 = { };
|
||||
|
@ -3572,7 +3572,7 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir,
|
|||
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)
|
||||
{
|
||||
|
@ -3588,7 +3588,7 @@ static int nfs4_proc_lookup(struct inode *dir, struct qstr *name,
|
|||
}
|
||||
|
||||
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);
|
||||
|
@ -3747,7 +3747,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
|
|||
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 = {
|
||||
|
@ -3770,7 +3770,7 @@ static int _nfs4_proc_remove(struct inode *dir, struct qstr *name)
|
|||
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;
|
||||
|
@ -3853,7 +3853,7 @@ static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
|
|||
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 = {
|
||||
|
@ -3900,7 +3900,7 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *
|
|||
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;
|
||||
|
@ -3922,7 +3922,7 @@ struct nfs4_createdata {
|
|||
};
|
||||
|
||||
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;
|
||||
|
||||
|
|
|
@ -145,7 +145,7 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
|
|||
}
|
||||
|
||||
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)
|
||||
{
|
||||
|
@ -299,7 +299,7 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
|
|||
}
|
||||
|
||||
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),
|
||||
|
@ -357,7 +357,7 @@ nfs_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
|
|||
}
|
||||
|
||||
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),
|
||||
|
@ -456,7 +456,7 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
|
|||
}
|
||||
|
||||
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),
|
||||
|
|
|
@ -162,7 +162,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
|
|||
* @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;
|
||||
|
|
|
@ -1543,7 +1543,7 @@ struct nfs_rpc_ops {
|
|||
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 *);
|
||||
|
@ -1551,18 +1551,18 @@ struct nfs_rpc_ops {
|
|||
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);
|
||||
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 (*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 *,
|
||||
|
|
Loading…
Reference in New Issue
Block a user