aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/fuse/file.c')
-rw-r--r--fs/fuse/file.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index b3a944e4bb9c..80b5fa80f5ec 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -39,7 +39,7 @@ static int fuse_send_open(struct inode *inode, struct file *file, int isdir,
39 req->out.numargs = 1; 39 req->out.numargs = 1;
40 req->out.args[0].size = sizeof(*outargp); 40 req->out.args[0].size = sizeof(*outargp);
41 req->out.args[0].value = outargp; 41 req->out.args[0].value = outargp;
42 request_send(fc, req); 42 fuse_request_send(fc, req);
43 err = req->out.h.error; 43 err = req->out.h.error;
44 fuse_put_request(fc, req); 44 fuse_put_request(fc, req);
45 45
@@ -93,7 +93,7 @@ static void fuse_file_put(struct fuse_file *ff)
93 struct inode *inode = req->misc.release.dentry->d_inode; 93 struct inode *inode = req->misc.release.dentry->d_inode;
94 struct fuse_conn *fc = get_fuse_conn(inode); 94 struct fuse_conn *fc = get_fuse_conn(inode);
95 req->end = fuse_release_end; 95 req->end = fuse_release_end;
96 request_send_background(fc, req); 96 fuse_request_send_background(fc, req);
97 kfree(ff); 97 kfree(ff);
98 } 98 }
99} 99}
@@ -289,7 +289,7 @@ static int fuse_flush(struct file *file, fl_owner_t id)
289 req->in.args[0].size = sizeof(inarg); 289 req->in.args[0].size = sizeof(inarg);
290 req->in.args[0].value = &inarg; 290 req->in.args[0].value = &inarg;
291 req->force = 1; 291 req->force = 1;
292 request_send(fc, req); 292 fuse_request_send(fc, req);
293 err = req->out.h.error; 293 err = req->out.h.error;
294 fuse_put_request(fc, req); 294 fuse_put_request(fc, req);
295 if (err == -ENOSYS) { 295 if (err == -ENOSYS) {
@@ -353,7 +353,7 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,
353 req->in.numargs = 1; 353 req->in.numargs = 1;
354 req->in.args[0].size = sizeof(inarg); 354 req->in.args[0].size = sizeof(inarg);
355 req->in.args[0].value = &inarg; 355 req->in.args[0].value = &inarg;
356 request_send(fc, req); 356 fuse_request_send(fc, req);
357 err = req->out.h.error; 357 err = req->out.h.error;
358 fuse_put_request(fc, req); 358 fuse_put_request(fc, req);
359 if (err == -ENOSYS) { 359 if (err == -ENOSYS) {
@@ -405,7 +405,7 @@ static size_t fuse_send_read(struct fuse_req *req, struct file *file,
405 inarg->read_flags |= FUSE_READ_LOCKOWNER; 405 inarg->read_flags |= FUSE_READ_LOCKOWNER;
406 inarg->lock_owner = fuse_lock_owner_id(fc, owner); 406 inarg->lock_owner = fuse_lock_owner_id(fc, owner);
407 } 407 }
408 request_send(fc, req); 408 fuse_request_send(fc, req);
409 return req->out.args[0].size; 409 return req->out.args[0].size;
410} 410}
411 411
@@ -517,9 +517,9 @@ static void fuse_send_readpages(struct fuse_req *req, struct file *file,
517 struct fuse_file *ff = file->private_data; 517 struct fuse_file *ff = file->private_data;
518 req->ff = fuse_file_get(ff); 518 req->ff = fuse_file_get(ff);
519 req->end = fuse_readpages_end; 519 req->end = fuse_readpages_end;
520 request_send_background(fc, req); 520 fuse_request_send_background(fc, req);
521 } else { 521 } else {
522 request_send(fc, req); 522 fuse_request_send(fc, req);
523 fuse_readpages_end(fc, req); 523 fuse_readpages_end(fc, req);
524 fuse_put_request(fc, req); 524 fuse_put_request(fc, req);
525 } 525 }
@@ -645,7 +645,7 @@ static size_t fuse_send_write(struct fuse_req *req, struct file *file,
645 inarg->write_flags |= FUSE_WRITE_LOCKOWNER; 645 inarg->write_flags |= FUSE_WRITE_LOCKOWNER;
646 inarg->lock_owner = fuse_lock_owner_id(fc, owner); 646 inarg->lock_owner = fuse_lock_owner_id(fc, owner);
647 } 647 }
648 request_send(fc, req); 648 fuse_request_send(fc, req);
649 return req->misc.write.out.size; 649 return req->misc.write.out.size;
650} 650}
651 651
@@ -1087,7 +1087,7 @@ static void fuse_send_writepage(struct fuse_conn *fc, struct fuse_req *req)
1087 1087
1088 req->in.args[1].size = inarg->size; 1088 req->in.args[1].size = inarg->size;
1089 fi->writectr++; 1089 fi->writectr++;
1090 request_send_background_locked(fc, req); 1090 fuse_request_send_background_locked(fc, req);
1091 return; 1091 return;
1092 1092
1093 out_free: 1093 out_free:
@@ -1334,7 +1334,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
1334 req->out.numargs = 1; 1334 req->out.numargs = 1;
1335 req->out.args[0].size = sizeof(outarg); 1335 req->out.args[0].size = sizeof(outarg);
1336 req->out.args[0].value = &outarg; 1336 req->out.args[0].value = &outarg;
1337 request_send(fc, req); 1337 fuse_request_send(fc, req);
1338 err = req->out.h.error; 1338 err = req->out.h.error;
1339 fuse_put_request(fc, req); 1339 fuse_put_request(fc, req);
1340 if (!err) 1340 if (!err)
@@ -1366,7 +1366,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
1366 return PTR_ERR(req); 1366 return PTR_ERR(req);
1367 1367
1368 fuse_lk_fill(req, file, fl, opcode, pid, flock); 1368 fuse_lk_fill(req, file, fl, opcode, pid, flock);
1369 request_send(fc, req); 1369 fuse_request_send(fc, req);
1370 err = req->out.h.error; 1370 err = req->out.h.error;
1371 /* locking is restartable */ 1371 /* locking is restartable */
1372 if (err == -EINTR) 1372 if (err == -EINTR)
@@ -1442,7 +1442,7 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
1442 req->out.numargs = 1; 1442 req->out.numargs = 1;
1443 req->out.args[0].size = sizeof(outarg); 1443 req->out.args[0].size = sizeof(outarg);
1444 req->out.args[0].value = &outarg; 1444 req->out.args[0].value = &outarg;
1445 request_send(fc, req); 1445 fuse_request_send(fc, req);
1446 err = req->out.h.error; 1446 err = req->out.h.error;
1447 fuse_put_request(fc, req); 1447 fuse_put_request(fc, req);
1448 if (err == -ENOSYS) 1448 if (err == -ENOSYS)
@@ -1681,7 +1681,7 @@ static long fuse_file_do_ioctl(struct file *file, unsigned int cmd,
1681 req->out.argpages = 1; 1681 req->out.argpages = 1;
1682 req->out.argvar = 1; 1682 req->out.argvar = 1;
1683 1683
1684 request_send(fc, req); 1684 fuse_request_send(fc, req);
1685 err = req->out.h.error; 1685 err = req->out.h.error;
1686 transferred = req->out.args[1].size; 1686 transferred = req->out.args[1].size;
1687 fuse_put_request(fc, req); 1687 fuse_put_request(fc, req);
@@ -1842,7 +1842,7 @@ static unsigned fuse_file_poll(struct file *file, poll_table *wait)
1842 req->out.numargs = 1; 1842 req->out.numargs = 1;
1843 req->out.args[0].size = sizeof(outarg); 1843 req->out.args[0].size = sizeof(outarg);
1844 req->out.args[0].value = &outarg; 1844 req->out.args[0].value = &outarg;
1845 request_send(fc, req); 1845 fuse_request_send(fc, req);
1846 err = req->out.h.error; 1846 err = req->out.h.error;
1847 fuse_put_request(fc, req); 1847 fuse_put_request(fc, req);
1848 1848