aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-04 04:05:48 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-11 22:29:48 -0400
commit0fa6b005afdb3152ce85df963302e59b61115f9b (patch)
tree23e3c90b10cbcf3d244615356619138055dd4e82 /fs/fuse
parent7ec7b94a3339756dfbb88234e3e45a428e8c08fb (diff)
generic_write_checks(): drop isblk argument
all remaining callers are passing 0; some just obscure that fact. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 3d355e946991..4c04a8144a75 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1167,7 +1167,7 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
1167 /* We can write back this queue in page reclaim */ 1167 /* We can write back this queue in page reclaim */
1168 current->backing_dev_info = inode_to_bdi(inode); 1168 current->backing_dev_info = inode_to_bdi(inode);
1169 1169
1170 err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode)); 1170 err = generic_write_checks(file, &pos, &count);
1171 if (err) 1171 if (err)
1172 goto out; 1172 goto out;
1173 1173
@@ -1420,7 +1420,7 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
1420 1420
1421 /* Don't allow parallel writes to the same file */ 1421 /* Don't allow parallel writes to the same file */
1422 mutex_lock(&inode->i_mutex); 1422 mutex_lock(&inode->i_mutex);
1423 res = generic_write_checks(file, &iocb->ki_pos, &count, 0); 1423 res = generic_write_checks(file, &iocb->ki_pos, &count);
1424 if (!res) { 1424 if (!res) {
1425 iov_iter_truncate(from, count); 1425 iov_iter_truncate(from, count);
1426 res = fuse_direct_io(&io, from, &iocb->ki_pos, FUSE_DIO_WRITE); 1426 res = fuse_direct_io(&io, from, &iocb->ki_pos, FUSE_DIO_WRITE);
@@ -2841,7 +2841,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
2841 io->done = &wait; 2841 io->done = &wait;
2842 2842
2843 if (iov_iter_rw(iter) == WRITE) { 2843 if (iov_iter_rw(iter) == WRITE) {
2844 ret = generic_write_checks(file, &pos, &count, 0); 2844 ret = generic_write_checks(file, &pos, &count);
2845 if (!ret) { 2845 if (!ret) {
2846 iov_iter_truncate(iter, count); 2846 iov_iter_truncate(iter, count);
2847 ret = fuse_direct_io(io, iter, &pos, FUSE_DIO_WRITE); 2847 ret = fuse_direct_io(io, iter, &pos, FUSE_DIO_WRITE);