diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-04 04:05:48 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:29:48 -0400 |
commit | 0fa6b005afdb3152ce85df963302e59b61115f9b (patch) | |
tree | 23e3c90b10cbcf3d244615356619138055dd4e82 /fs | |
parent | 7ec7b94a3339756dfbb88234e3e45a428e8c08fb (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')
-rw-r--r-- | fs/9p/vfs_file.c | 2 | ||||
-rw-r--r-- | fs/btrfs/file.c | 2 | ||||
-rw-r--r-- | fs/ceph/file.c | 2 | ||||
-rw-r--r-- | fs/cifs/file.c | 4 | ||||
-rw-r--r-- | fs/ext4/file.c | 2 | ||||
-rw-r--r-- | fs/fuse/file.c | 6 | ||||
-rw-r--r-- | fs/ncpfs/file.c | 2 | ||||
-rw-r--r-- | fs/nfs/direct.c | 2 | ||||
-rw-r--r-- | fs/ntfs/file.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/file.c | 3 | ||||
-rw-r--r-- | fs/udf/file.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_file.c | 2 |
12 files changed, 15 insertions, 16 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index d7fcb775311e..b5b020ace1b3 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) | |||
409 | size_t count = iov_iter_count(from); | 409 | size_t count = iov_iter_count(from); |
410 | int err = 0; | 410 | int err = 0; |
411 | 411 | ||
412 | retval = generic_write_checks(file, &origin, &count, 0); | 412 | retval = generic_write_checks(file, &origin, &count); |
413 | if (retval) | 413 | if (retval) |
414 | return retval; | 414 | return retval; |
415 | 415 | ||
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index cdc801c85105..691a84a81e09 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, | |||
1747 | mutex_lock(&inode->i_mutex); | 1747 | mutex_lock(&inode->i_mutex); |
1748 | 1748 | ||
1749 | current->backing_dev_info = inode_to_bdi(inode); | 1749 | current->backing_dev_info = inode_to_bdi(inode); |
1750 | err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode)); | 1750 | err = generic_write_checks(file, &pos, &count); |
1751 | if (err) { | 1751 | if (err) { |
1752 | mutex_unlock(&inode->i_mutex); | 1752 | mutex_unlock(&inode->i_mutex); |
1753 | goto out; | 1753 | goto out; |
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 56237ea5fc22..761841903160 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) | |||
953 | /* We can write back this queue in page reclaim */ | 953 | /* We can write back this queue in page reclaim */ |
954 | current->backing_dev_info = inode_to_bdi(inode); | 954 | current->backing_dev_info = inode_to_bdi(inode); |
955 | 955 | ||
956 | err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode)); | 956 | err = generic_write_checks(file, &pos, &count); |
957 | if (err) | 957 | if (err) |
958 | goto out; | 958 | goto out; |
959 | 959 | ||
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 3c5c9bc5cbaf..4202e74b2db5 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) | |||
2580 | */ | 2580 | */ |
2581 | 2581 | ||
2582 | len = iov_iter_count(from); | 2582 | len = iov_iter_count(from); |
2583 | rc = generic_write_checks(file, &iocb->ki_pos, &len, 0); | 2583 | rc = generic_write_checks(file, &iocb->ki_pos, &len); |
2584 | if (rc) | 2584 | if (rc) |
2585 | return rc; | 2585 | return rc; |
2586 | 2586 | ||
@@ -2684,7 +2684,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from) | |||
2684 | mutex_lock(&inode->i_mutex); | 2684 | mutex_lock(&inode->i_mutex); |
2685 | 2685 | ||
2686 | count = iov_iter_count(from); | 2686 | count = iov_iter_count(from); |
2687 | rc = generic_write_checks(file, &iocb->ki_pos, &count, 0); | 2687 | rc = generic_write_checks(file, &iocb->ki_pos, &count); |
2688 | if (rc) | 2688 | if (rc) |
2689 | goto out; | 2689 | goto out; |
2690 | 2690 | ||
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index f7cca423dded..1f0afc181b7b 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) | |||
171 | } | 171 | } |
172 | } | 172 | } |
173 | 173 | ||
174 | ret = generic_write_checks(file, &iocb->ki_pos, &length, 0); | 174 | ret = generic_write_checks(file, &iocb->ki_pos, &length); |
175 | if (ret) | 175 | if (ret) |
176 | goto out; | 176 | goto out; |
177 | 177 | ||
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); |
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index 479bf8db264e..ab6363b16556 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) | |||
177 | void *bouncebuffer; | 177 | void *bouncebuffer; |
178 | 178 | ||
179 | ncp_dbg(1, "enter %pD2\n", file); | 179 | ncp_dbg(1, "enter %pD2\n", file); |
180 | errno = generic_write_checks(file, &pos, &count, 0); | 180 | errno = generic_write_checks(file, &pos, &count); |
181 | if (errno) | 181 | if (errno) |
182 | return errno; | 182 | return errno; |
183 | iov_iter_truncate(from, count); | 183 | iov_iter_truncate(from, count); |
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 06503bc604e1..5ddd77acb3f7 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, | |||
977 | dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n", | 977 | dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n", |
978 | file, count, (long long) pos); | 978 | file, count, (long long) pos); |
979 | 979 | ||
980 | result = generic_write_checks(file, &pos, &count, 0); | 980 | result = generic_write_checks(file, &pos, &count); |
981 | if (result) | 981 | if (result) |
982 | goto out; | 982 | goto out; |
983 | 983 | ||
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index 77087d5ad458..cec4ec3c1ede 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, | |||
345 | "0x%llx, count 0x%zx.", vi->i_ino, | 345 | "0x%llx, count 0x%zx.", vi->i_ino, |
346 | (unsigned)le32_to_cpu(ni->type), | 346 | (unsigned)le32_to_cpu(ni->type), |
347 | (unsigned long long)iocb->ki_pos, count); | 347 | (unsigned long long)iocb->ki_pos, count); |
348 | err = generic_write_checks(file, &iocb->ki_pos, &count, S_ISBLK(vi->i_mode)); | 348 | err = generic_write_checks(file, &iocb->ki_pos, &count); |
349 | if (unlikely(err)) | 349 | if (unlikely(err)) |
350 | goto out; | 350 | goto out; |
351 | iov_iter_truncate(from, count); | 351 | iov_iter_truncate(from, count); |
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 0a6ec7e6efd8..1c11314946cb 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -2374,8 +2374,7 @@ relock: | |||
2374 | /* communicate with ocfs2_dio_end_io */ | 2374 | /* communicate with ocfs2_dio_end_io */ |
2375 | ocfs2_iocb_set_rw_locked(iocb, rw_level); | 2375 | ocfs2_iocb_set_rw_locked(iocb, rw_level); |
2376 | 2376 | ||
2377 | ret = generic_write_checks(file, ppos, &count, | 2377 | ret = generic_write_checks(file, ppos, &count); |
2378 | S_ISBLK(inode->i_mode)); | ||
2379 | if (ret) | 2378 | if (ret) |
2380 | goto out_dio; | 2379 | goto out_dio; |
2381 | 2380 | ||
diff --git a/fs/udf/file.c b/fs/udf/file.c index 35e81ed99405..6834509a7e5a 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) | |||
151 | } else | 151 | } else |
152 | up_write(&iinfo->i_data_sem); | 152 | up_write(&iinfo->i_data_sem); |
153 | 153 | ||
154 | retval = generic_write_checks(file, &iocb->ki_pos, &count, 0); | 154 | retval = generic_write_checks(file, &iocb->ki_pos, &count); |
155 | if (retval) | 155 | if (retval) |
156 | goto out; | 156 | goto out; |
157 | 157 | ||
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 44856c3b9617..43c0e6686c47 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c | |||
@@ -554,7 +554,7 @@ xfs_file_aio_write_checks( | |||
554 | int error = 0; | 554 | int error = 0; |
555 | 555 | ||
556 | restart: | 556 | restart: |
557 | error = generic_write_checks(file, pos, count, S_ISBLK(inode->i_mode)); | 557 | error = generic_write_checks(file, pos, count); |
558 | if (error) | 558 | if (error) |
559 | return error; | 559 | return error; |
560 | 560 | ||