diff options
Diffstat (limited to 'fs/fuse/cuse.c')
| -rw-r--r-- | fs/fuse/cuse.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c index b96a49b37d66..13b691a8a7d2 100644 --- a/fs/fuse/cuse.c +++ b/fs/fuse/cuse.c | |||
| @@ -95,7 +95,7 @@ static ssize_t cuse_read(struct file *file, char __user *buf, size_t count, | |||
| 95 | struct iovec iov = { .iov_base = buf, .iov_len = count }; | 95 | struct iovec iov = { .iov_base = buf, .iov_len = count }; |
| 96 | struct fuse_io_priv io = { .async = 0, .file = file }; | 96 | struct fuse_io_priv io = { .async = 0, .file = file }; |
| 97 | 97 | ||
| 98 | return fuse_direct_io(&io, &iov, 1, count, &pos, 0); | 98 | return fuse_direct_io(&io, &iov, 1, count, &pos, FUSE_DIO_CUSE); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static ssize_t cuse_write(struct file *file, const char __user *buf, | 101 | static ssize_t cuse_write(struct file *file, const char __user *buf, |
| @@ -109,7 +109,8 @@ static ssize_t cuse_write(struct file *file, const char __user *buf, | |||
| 109 | * No locking or generic_write_checks(), the server is | 109 | * No locking or generic_write_checks(), the server is |
| 110 | * responsible for locking and sanity checks. | 110 | * responsible for locking and sanity checks. |
| 111 | */ | 111 | */ |
| 112 | return fuse_direct_io(&io, &iov, 1, count, &pos, 1); | 112 | return fuse_direct_io(&io, &iov, 1, count, &pos, |
| 113 | FUSE_DIO_WRITE | FUSE_DIO_CUSE); | ||
| 113 | } | 114 | } |
| 114 | 115 | ||
| 115 | static int cuse_open(struct inode *inode, struct file *file) | 116 | static int cuse_open(struct inode *inode, struct file *file) |
| @@ -568,7 +569,7 @@ static ssize_t cuse_class_waiting_show(struct device *dev, | |||
| 568 | 569 | ||
| 569 | return sprintf(buf, "%d\n", atomic_read(&cc->fc.num_waiting)); | 570 | return sprintf(buf, "%d\n", atomic_read(&cc->fc.num_waiting)); |
| 570 | } | 571 | } |
| 571 | static DEVICE_ATTR(waiting, S_IFREG | 0400, cuse_class_waiting_show, NULL); | 572 | static DEVICE_ATTR(waiting, 0400, cuse_class_waiting_show, NULL); |
| 572 | 573 | ||
| 573 | static ssize_t cuse_class_abort_store(struct device *dev, | 574 | static ssize_t cuse_class_abort_store(struct device *dev, |
| 574 | struct device_attribute *attr, | 575 | struct device_attribute *attr, |
| @@ -579,7 +580,7 @@ static ssize_t cuse_class_abort_store(struct device *dev, | |||
| 579 | fuse_abort_conn(&cc->fc); | 580 | fuse_abort_conn(&cc->fc); |
| 580 | return count; | 581 | return count; |
| 581 | } | 582 | } |
| 582 | static DEVICE_ATTR(abort, S_IFREG | 0200, NULL, cuse_class_abort_store); | 583 | static DEVICE_ATTR(abort, 0200, NULL, cuse_class_abort_store); |
| 583 | 584 | ||
| 584 | static struct attribute *cuse_class_dev_attrs[] = { | 585 | static struct attribute *cuse_class_dev_attrs[] = { |
| 585 | &dev_attr_waiting.attr, | 586 | &dev_attr_waiting.attr, |
