Commit 13983d06 authored by Al Viro's avatar Al Viro
Browse files

qstr: constify instances in fuse


Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9aba36de
...@@ -146,7 +146,7 @@ static void fuse_invalidate_entry(struct dentry *entry) ...@@ -146,7 +146,7 @@ static void fuse_invalidate_entry(struct dentry *entry)
} }
static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_args *args, static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_args *args,
u64 nodeid, struct qstr *name, u64 nodeid, const struct qstr *name,
struct fuse_entry_out *outarg) struct fuse_entry_out *outarg)
{ {
memset(outarg, 0, sizeof(struct fuse_entry_out)); memset(outarg, 0, sizeof(struct fuse_entry_out));
...@@ -282,7 +282,7 @@ int fuse_valid_type(int m) ...@@ -282,7 +282,7 @@ int fuse_valid_type(int m)
S_ISBLK(m) || S_ISFIFO(m) || S_ISSOCK(m); S_ISBLK(m) || S_ISFIFO(m) || S_ISSOCK(m);
} }
int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name, int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name,
struct fuse_entry_out *outarg, struct inode **inode) struct fuse_entry_out *outarg, struct inode **inode)
{ {
struct fuse_conn *fc = get_fuse_conn_super(sb); struct fuse_conn *fc = get_fuse_conn_super(sb);
......
...@@ -703,7 +703,7 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid, ...@@ -703,7 +703,7 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid,
int generation, struct fuse_attr *attr, int generation, struct fuse_attr *attr,
u64 attr_valid, u64 attr_version); u64 attr_valid, u64 attr_version);
int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name, int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name,
struct fuse_entry_out *outarg, struct inode **inode); struct fuse_entry_out *outarg, struct inode **inode);
/** /**
......
...@@ -673,13 +673,11 @@ static struct dentry *fuse_get_dentry(struct super_block *sb, ...@@ -673,13 +673,11 @@ static struct dentry *fuse_get_dentry(struct super_block *sb,
inode = ilookup5(sb, handle->nodeid, fuse_inode_eq, &handle->nodeid); inode = ilookup5(sb, handle->nodeid, fuse_inode_eq, &handle->nodeid);
if (!inode) { if (!inode) {
struct fuse_entry_out outarg; struct fuse_entry_out outarg;
struct qstr name; const struct qstr name = QSTR_INIT(".", 1);
if (!fc->export_support) if (!fc->export_support)
goto out_err; goto out_err;
name.len = 1;
name.name = ".";
err = fuse_lookup_name(sb, handle->nodeid, &name, &outarg, err = fuse_lookup_name(sb, handle->nodeid, &name, &outarg,
&inode); &inode);
if (err && err != -ENOENT) if (err && err != -ENOENT)
...@@ -775,14 +773,12 @@ static struct dentry *fuse_get_parent(struct dentry *child) ...@@ -775,14 +773,12 @@ static struct dentry *fuse_get_parent(struct dentry *child)
struct inode *inode; struct inode *inode;
struct dentry *parent; struct dentry *parent;
struct fuse_entry_out outarg; struct fuse_entry_out outarg;
struct qstr name; const struct qstr name = QSTR_INIT("..", 2);
int err; int err;
if (!fc->export_support) if (!fc->export_support)
return ERR_PTR(-ESTALE); return ERR_PTR(-ESTALE);
name.len = 2;
name.name = "..";
err = fuse_lookup_name(child_inode->i_sb, get_node_id(child_inode), err = fuse_lookup_name(child_inode->i_sb, get_node_id(child_inode),
&name, &outarg, &inode); &name, &outarg, &inode);
if (err) { if (err) {
......
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