summaryrefslogtreecommitdiffstats
path: root/fs
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
parent7ec7b94a3339756dfbb88234e3e45a428e8c08fb (diff)
downloadop-kernel-dev-0fa6b005afdb3152ce85df963302e59b61115f9b.zip
op-kernel-dev-0fa6b005afdb3152ce85df963302e59b61115f9b.tar.gz
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')
-rw-r--r--fs/9p/vfs_file.c2
-rw-r--r--fs/btrfs/file.c2
-rw-r--r--fs/ceph/file.c2
-rw-r--r--fs/cifs/file.c4
-rw-r--r--fs/ext4/file.c2
-rw-r--r--fs/fuse/file.c6
-rw-r--r--fs/ncpfs/file.c2
-rw-r--r--fs/nfs/direct.c2
-rw-r--r--fs/ntfs/file.c2
-rw-r--r--fs/ocfs2/file.c3
-rw-r--r--fs/udf/file.c2
-rw-r--r--fs/xfs/xfs_file.c2
12 files changed, 15 insertions, 16 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index d7fcb77..b5b020a 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -409,7 +409,7 @@ v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
size_t count = iov_iter_count(from);
int err = 0;
- retval = generic_write_checks(file, &origin, &count, 0);
+ retval = generic_write_checks(file, &origin, &count);
if (retval)
return retval;
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index cdc801c..691a84a 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1747,7 +1747,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
mutex_lock(&inode->i_mutex);
current->backing_dev_info = inode_to_bdi(inode);
- err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
+ err = generic_write_checks(file, &pos, &count);
if (err) {
mutex_unlock(&inode->i_mutex);
goto out;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 56237ea..7618419 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -953,7 +953,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
/* We can write back this queue in page reclaim */
current->backing_dev_info = inode_to_bdi(inode);
- err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
+ err = generic_write_checks(file, &pos, &count);
if (err)
goto out;
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 3c5c9bc..4202e74 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2580,7 +2580,7 @@ ssize_t cifs_user_writev(struct kiocb *iocb, struct iov_iter *from)
*/
len = iov_iter_count(from);
- rc = generic_write_checks(file, &iocb->ki_pos, &len, 0);
+ rc = generic_write_checks(file, &iocb->ki_pos, &len);
if (rc)
return rc;
@@ -2684,7 +2684,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
mutex_lock(&inode->i_mutex);
count = iov_iter_count(from);
- rc = generic_write_checks(file, &iocb->ki_pos, &count, 0);
+ rc = generic_write_checks(file, &iocb->ki_pos, &count);
if (rc)
goto out;
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index f7cca42..1f0afc1 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -171,7 +171,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
}
}
- ret = generic_write_checks(file, &iocb->ki_pos, &length, 0);
+ ret = generic_write_checks(file, &iocb->ki_pos, &length);
if (ret)
goto out;
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 3d355e9..4c04a81 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)
/* We can write back this queue in page reclaim */
current->backing_dev_info = inode_to_bdi(inode);
- err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
+ err = generic_write_checks(file, &pos, &count);
if (err)
goto out;
@@ -1420,7 +1420,7 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
/* Don't allow parallel writes to the same file */
mutex_lock(&inode->i_mutex);
- res = generic_write_checks(file, &iocb->ki_pos, &count, 0);
+ res = generic_write_checks(file, &iocb->ki_pos, &count);
if (!res) {
iov_iter_truncate(from, count);
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)
io->done = &wait;
if (iov_iter_rw(iter) == WRITE) {
- ret = generic_write_checks(file, &pos, &count, 0);
+ ret = generic_write_checks(file, &pos, &count);
if (!ret) {
iov_iter_truncate(iter, count);
ret = fuse_direct_io(io, iter, &pos, FUSE_DIO_WRITE);
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 479bf8d..ab6363b 100644
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -177,7 +177,7 @@ ncp_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
void *bouncebuffer;
ncp_dbg(1, "enter %pD2\n", file);
- errno = generic_write_checks(file, &pos, &count, 0);
+ errno = generic_write_checks(file, &pos, &count);
if (errno)
return errno;
iov_iter_truncate(from, count);
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 06503bc..5ddd77a 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -977,7 +977,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n",
file, count, (long long) pos);
- result = generic_write_checks(file, &pos, &count, 0);
+ result = generic_write_checks(file, &pos, &count);
if (result)
goto out;
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 77087d5..cec4ec3 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -345,7 +345,7 @@ static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb,
"0x%llx, count 0x%zx.", vi->i_ino,
(unsigned)le32_to_cpu(ni->type),
(unsigned long long)iocb->ki_pos, count);
- err = generic_write_checks(file, &iocb->ki_pos, &count, S_ISBLK(vi->i_mode));
+ err = generic_write_checks(file, &iocb->ki_pos, &count);
if (unlikely(err))
goto out;
iov_iter_truncate(from, count);
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 0a6ec7e..1c11314 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2374,8 +2374,7 @@ relock:
/* communicate with ocfs2_dio_end_io */
ocfs2_iocb_set_rw_locked(iocb, rw_level);
- ret = generic_write_checks(file, ppos, &count,
- S_ISBLK(inode->i_mode));
+ ret = generic_write_checks(file, ppos, &count);
if (ret)
goto out_dio;
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 35e81ed..6834509 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -151,7 +151,7 @@ static ssize_t udf_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
} else
up_write(&iinfo->i_data_sem);
- retval = generic_write_checks(file, &iocb->ki_pos, &count, 0);
+ retval = generic_write_checks(file, &iocb->ki_pos, &count);
if (retval)
goto out;
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 44856c3..43c0e66 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -554,7 +554,7 @@ xfs_file_aio_write_checks(
int error = 0;
restart:
- error = generic_write_checks(file, pos, count, S_ISBLK(inode->i_mode));
+ error = generic_write_checks(file, pos, count);
if (error)
return error;
OpenPOWER on IntegriCloud