diff options
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r-- | fs/fuse/inode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index ba7256128084..ee91639c6d35 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -94,7 +94,7 @@ void fuse_send_forget(struct fuse_conn *fc, struct fuse_req *req, | |||
94 | req->in.numargs = 1; | 94 | req->in.numargs = 1; |
95 | req->in.args[0].size = sizeof(struct fuse_forget_in); | 95 | req->in.args[0].size = sizeof(struct fuse_forget_in); |
96 | req->in.args[0].value = inarg; | 96 | req->in.args[0].value = inarg; |
97 | request_send_noreply(fc, req); | 97 | fuse_request_send_noreply(fc, req); |
98 | } | 98 | } |
99 | 99 | ||
100 | static void fuse_clear_inode(struct inode *inode) | 100 | static void fuse_clear_inode(struct inode *inode) |
@@ -269,7 +269,7 @@ static void fuse_send_destroy(struct fuse_conn *fc) | |||
269 | fc->destroy_req = NULL; | 269 | fc->destroy_req = NULL; |
270 | req->in.h.opcode = FUSE_DESTROY; | 270 | req->in.h.opcode = FUSE_DESTROY; |
271 | req->force = 1; | 271 | req->force = 1; |
272 | request_send(fc, req); | 272 | fuse_request_send(fc, req); |
273 | fuse_put_request(fc, req); | 273 | fuse_put_request(fc, req); |
274 | } | 274 | } |
275 | } | 275 | } |
@@ -334,7 +334,7 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
334 | req->out.args[0].size = | 334 | req->out.args[0].size = |
335 | fc->minor < 4 ? FUSE_COMPAT_STATFS_SIZE : sizeof(outarg); | 335 | fc->minor < 4 ? FUSE_COMPAT_STATFS_SIZE : sizeof(outarg); |
336 | req->out.args[0].value = &outarg; | 336 | req->out.args[0].value = &outarg; |
337 | request_send(fc, req); | 337 | fuse_request_send(fc, req); |
338 | err = req->out.h.error; | 338 | err = req->out.h.error; |
339 | if (!err) | 339 | if (!err) |
340 | convert_fuse_statfs(buf, &outarg.st); | 340 | convert_fuse_statfs(buf, &outarg.st); |
@@ -544,7 +544,7 @@ struct fuse_conn *fuse_conn_get(struct fuse_conn *fc) | |||
544 | return fc; | 544 | return fc; |
545 | } | 545 | } |
546 | 546 | ||
547 | static struct inode *get_root_inode(struct super_block *sb, unsigned mode) | 547 | static struct inode *fuse_get_root_inode(struct super_block *sb, unsigned mode) |
548 | { | 548 | { |
549 | struct fuse_attr attr; | 549 | struct fuse_attr attr; |
550 | memset(&attr, 0, sizeof(attr)); | 550 | memset(&attr, 0, sizeof(attr)); |
@@ -787,7 +787,7 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req) | |||
787 | req->out.args[0].size = sizeof(struct fuse_init_out); | 787 | req->out.args[0].size = sizeof(struct fuse_init_out); |
788 | req->out.args[0].value = &req->misc.init_out; | 788 | req->out.args[0].value = &req->misc.init_out; |
789 | req->end = process_init_reply; | 789 | req->end = process_init_reply; |
790 | request_send_background(fc, req); | 790 | fuse_request_send_background(fc, req); |
791 | } | 791 | } |
792 | 792 | ||
793 | static int fuse_fill_super(struct super_block *sb, void *data, int silent) | 793 | static int fuse_fill_super(struct super_block *sb, void *data, int silent) |
@@ -841,7 +841,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) | |||
841 | sb->s_fs_info = fc; | 841 | sb->s_fs_info = fc; |
842 | 842 | ||
843 | err = -ENOMEM; | 843 | err = -ENOMEM; |
844 | root = get_root_inode(sb, d.rootmode); | 844 | root = fuse_get_root_inode(sb, d.rootmode); |
845 | if (!root) | 845 | if (!root) |
846 | goto err; | 846 | goto err; |
847 | 847 | ||