aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/fuse/dir.c')
-rw-r--r--fs/fuse/dir.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 16ae55d347bb..f310768a02fe 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -189,7 +189,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
189 parent = dget_parent(entry); 189 parent = dget_parent(entry);
190 fuse_lookup_init(fc, req, get_node_id(parent->d_inode), 190 fuse_lookup_init(fc, req, get_node_id(parent->d_inode),
191 &entry->d_name, &outarg); 191 &entry->d_name, &outarg);
192 request_send(fc, req); 192 fuse_request_send(fc, req);
193 dput(parent); 193 dput(parent);
194 err = req->out.h.error; 194 err = req->out.h.error;
195 fuse_put_request(fc, req); 195 fuse_put_request(fc, req);
@@ -283,7 +283,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name,
283 attr_version = fuse_get_attr_version(fc); 283 attr_version = fuse_get_attr_version(fc);
284 284
285 fuse_lookup_init(fc, req, nodeid, name, outarg); 285 fuse_lookup_init(fc, req, nodeid, name, outarg);
286 request_send(fc, req); 286 fuse_request_send(fc, req);
287 err = req->out.h.error; 287 err = req->out.h.error;
288 fuse_put_request(fc, req); 288 fuse_put_request(fc, req);
289 /* Zero nodeid is same as -ENOENT, but with valid timeout */ 289 /* Zero nodeid is same as -ENOENT, but with valid timeout */
@@ -369,7 +369,7 @@ static void fuse_sync_release(struct fuse_conn *fc, struct fuse_file *ff,
369{ 369{
370 fuse_release_fill(ff, nodeid, flags, FUSE_RELEASE); 370 fuse_release_fill(ff, nodeid, flags, FUSE_RELEASE);
371 ff->reserved_req->force = 1; 371 ff->reserved_req->force = 1;
372 request_send(fc, ff->reserved_req); 372 fuse_request_send(fc, ff->reserved_req);
373 fuse_put_request(fc, ff->reserved_req); 373 fuse_put_request(fc, ff->reserved_req);
374 kfree(ff); 374 kfree(ff);
375} 375}
@@ -432,7 +432,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
432 req->out.args[0].value = &outentry; 432 req->out.args[0].value = &outentry;
433 req->out.args[1].size = sizeof(outopen); 433 req->out.args[1].size = sizeof(outopen);
434 req->out.args[1].value = &outopen; 434 req->out.args[1].value = &outopen;
435 request_send(fc, req); 435 fuse_request_send(fc, req);
436 err = req->out.h.error; 436 err = req->out.h.error;
437 if (err) { 437 if (err) {
438 if (err == -ENOSYS) 438 if (err == -ENOSYS)
@@ -502,7 +502,7 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req,
502 else 502 else
503 req->out.args[0].size = sizeof(outarg); 503 req->out.args[0].size = sizeof(outarg);
504 req->out.args[0].value = &outarg; 504 req->out.args[0].value = &outarg;
505 request_send(fc, req); 505 fuse_request_send(fc, req);
506 err = req->out.h.error; 506 err = req->out.h.error;
507 fuse_put_request(fc, req); 507 fuse_put_request(fc, req);
508 if (err) 508 if (err)
@@ -631,7 +631,7 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
631 req->in.numargs = 1; 631 req->in.numargs = 1;
632 req->in.args[0].size = entry->d_name.len + 1; 632 req->in.args[0].size = entry->d_name.len + 1;
633 req->in.args[0].value = entry->d_name.name; 633 req->in.args[0].value = entry->d_name.name;
634 request_send(fc, req); 634 fuse_request_send(fc, req);
635 err = req->out.h.error; 635 err = req->out.h.error;
636 fuse_put_request(fc, req); 636 fuse_put_request(fc, req);
637 if (!err) { 637 if (!err) {
@@ -664,7 +664,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)
664 req->in.numargs = 1; 664 req->in.numargs = 1;
665 req->in.args[0].size = entry->d_name.len + 1; 665 req->in.args[0].size = entry->d_name.len + 1;
666 req->in.args[0].value = entry->d_name.name; 666 req->in.args[0].value = entry->d_name.name;
667 request_send(fc, req); 667 fuse_request_send(fc, req);
668 err = req->out.h.error; 668 err = req->out.h.error;
669 fuse_put_request(fc, req); 669 fuse_put_request(fc, req);
670 if (!err) { 670 if (!err) {
@@ -697,7 +697,7 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent,
697 req->in.args[1].value = oldent->d_name.name; 697 req->in.args[1].value = oldent->d_name.name;
698 req->in.args[2].size = newent->d_name.len + 1; 698 req->in.args[2].size = newent->d_name.len + 1;
699 req->in.args[2].value = newent->d_name.name; 699 req->in.args[2].value = newent->d_name.name;
700 request_send(fc, req); 700 fuse_request_send(fc, req);
701 err = req->out.h.error; 701 err = req->out.h.error;
702 fuse_put_request(fc, req); 702 fuse_put_request(fc, req);
703 if (!err) { 703 if (!err) {
@@ -813,7 +813,7 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
813 else 813 else
814 req->out.args[0].size = sizeof(outarg); 814 req->out.args[0].size = sizeof(outarg);
815 req->out.args[0].value = &outarg; 815 req->out.args[0].value = &outarg;
816 request_send(fc, req); 816 fuse_request_send(fc, req);
817 err = req->out.h.error; 817 err = req->out.h.error;
818 fuse_put_request(fc, req); 818 fuse_put_request(fc, req);
819 if (!err) { 819 if (!err) {
@@ -906,7 +906,7 @@ static int fuse_access(struct inode *inode, int mask)
906 req->in.numargs = 1; 906 req->in.numargs = 1;
907 req->in.args[0].size = sizeof(inarg); 907 req->in.args[0].size = sizeof(inarg);
908 req->in.args[0].value = &inarg; 908 req->in.args[0].value = &inarg;
909 request_send(fc, req); 909 fuse_request_send(fc, req);
910 err = req->out.h.error; 910 err = req->out.h.error;
911 fuse_put_request(fc, req); 911 fuse_put_request(fc, req);
912 if (err == -ENOSYS) { 912 if (err == -ENOSYS) {
@@ -1028,7 +1028,7 @@ static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir)
1028 req->num_pages = 1; 1028 req->num_pages = 1;
1029 req->pages[0] = page; 1029 req->pages[0] = page;
1030 fuse_read_fill(req, file, inode, file->f_pos, PAGE_SIZE, FUSE_READDIR); 1030 fuse_read_fill(req, file, inode, file->f_pos, PAGE_SIZE, FUSE_READDIR);
1031 request_send(fc, req); 1031 fuse_request_send(fc, req);
1032 nbytes = req->out.args[0].size; 1032 nbytes = req->out.args[0].size;
1033 err = req->out.h.error; 1033 err = req->out.h.error;
1034 fuse_put_request(fc, req); 1034 fuse_put_request(fc, req);
@@ -1062,7 +1062,7 @@ static char *read_link(struct dentry *dentry)
1062 req->out.numargs = 1; 1062 req->out.numargs = 1;
1063 req->out.args[0].size = PAGE_SIZE - 1; 1063 req->out.args[0].size = PAGE_SIZE - 1;
1064 req->out.args[0].value = link; 1064 req->out.args[0].value = link;
1065 request_send(fc, req); 1065 fuse_request_send(fc, req);
1066 if (req->out.h.error) { 1066 if (req->out.h.error) {
1067 free_page((unsigned long) link); 1067 free_page((unsigned long) link);
1068 link = ERR_PTR(req->out.h.error); 1068 link = ERR_PTR(req->out.h.error);
@@ -1268,7 +1268,7 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr,
1268 else 1268 else
1269 req->out.args[0].size = sizeof(outarg); 1269 req->out.args[0].size = sizeof(outarg);
1270 req->out.args[0].value = &outarg; 1270 req->out.args[0].value = &outarg;
1271 request_send(fc, req); 1271 fuse_request_send(fc, req);
1272 err = req->out.h.error; 1272 err = req->out.h.error;
1273 fuse_put_request(fc, req); 1273 fuse_put_request(fc, req);
1274 if (err) { 1274 if (err) {
@@ -1362,7 +1362,7 @@ static int fuse_setxattr(struct dentry *entry, const char *name,
1362 req->in.args[1].value = name; 1362 req->in.args[1].value = name;
1363 req->in.args[2].size = size; 1363 req->in.args[2].size = size;
1364 req->in.args[2].value = value; 1364 req->in.args[2].value = value;
1365 request_send(fc, req); 1365 fuse_request_send(fc, req);
1366 err = req->out.h.error; 1366 err = req->out.h.error;
1367 fuse_put_request(fc, req); 1367 fuse_put_request(fc, req);
1368 if (err == -ENOSYS) { 1368 if (err == -ENOSYS) {
@@ -1408,7 +1408,7 @@ static ssize_t fuse_getxattr(struct dentry *entry, const char *name,
1408 req->out.args[0].size = sizeof(outarg); 1408 req->out.args[0].size = sizeof(outarg);
1409 req->out.args[0].value = &outarg; 1409 req->out.args[0].value = &outarg;
1410 } 1410 }
1411 request_send(fc, req); 1411 fuse_request_send(fc, req);
1412 ret = req->out.h.error; 1412 ret = req->out.h.error;
1413 if (!ret) 1413 if (!ret)
1414 ret = size ? req->out.args[0].size : outarg.size; 1414 ret = size ? req->out.args[0].size : outarg.size;
@@ -1458,7 +1458,7 @@ static ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)
1458 req->out.args[0].size = sizeof(outarg); 1458 req->out.args[0].size = sizeof(outarg);
1459 req->out.args[0].value = &outarg; 1459 req->out.args[0].value = &outarg;
1460 } 1460 }
1461 request_send(fc, req); 1461 fuse_request_send(fc, req);
1462 ret = req->out.h.error; 1462 ret = req->out.h.error;
1463 if (!ret) 1463 if (!ret)
1464 ret = size ? req->out.args[0].size : outarg.size; 1464 ret = size ? req->out.args[0].size : outarg.size;
@@ -1491,7 +1491,7 @@ static int fuse_removexattr(struct dentry *entry, const char *name)
1491 req->in.numargs = 1; 1491 req->in.numargs = 1;
1492 req->in.args[0].size = strlen(name) + 1; 1492 req->in.args[0].size = strlen(name) + 1;
1493 req->in.args[0].value = name; 1493 req->in.args[0].value = name;
1494 request_send(fc, req); 1494 fuse_request_send(fc, req);
1495 err = req->out.h.error; 1495 err = req->out.h.error;
1496 fuse_put_request(fc, req); 1496 fuse_put_request(fc, req);
1497 if (err == -ENOSYS) { 1497 if (err == -ENOSYS) {