diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-04 15:24:06 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:43 -0400 |
commit | cb66a7a1f149ff705fa37cad6d1252b046e0ad4f (patch) | |
tree | 32dd17f294e9ef96bfea727bba313a33590917ab /fs/ceph/file.c | |
parent | 0ae5e4d370599592eab845527b31708a4f3411be (diff) |
kill generic_segment_checks()
all callers of ->aio_read() and ->aio_write() have iov/nr_segs already
checked - generic_segment_checks() done after that is just an odd way
to spell iov_length().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ceph/file.c')
-rw-r--r-- | fs/ceph/file.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index ef9115e4a6fa..21a56c27b74c 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c | |||
@@ -828,12 +828,8 @@ again: | |||
828 | inode, ceph_vinop(inode), iocb->ki_pos, (unsigned)len, | 828 | inode, ceph_vinop(inode), iocb->ki_pos, (unsigned)len, |
829 | ceph_cap_string(got)); | 829 | ceph_cap_string(got)); |
830 | 830 | ||
831 | if (!read) { | 831 | if (!read) |
832 | ret = generic_segment_checks(iov, &nr_segs, | 832 | len = iov_length(iov, nr_segs); |
833 | &len, VERIFY_WRITE); | ||
834 | if (ret) | ||
835 | goto out; | ||
836 | } | ||
837 | 833 | ||
838 | iov_iter_init(&i, iov, nr_segs, len, read); | 834 | iov_iter_init(&i, iov, nr_segs, len, read); |
839 | 835 | ||
@@ -855,7 +851,6 @@ again: | |||
855 | 851 | ||
856 | ret = generic_file_aio_read(iocb, iov, nr_segs, pos); | 852 | ret = generic_file_aio_read(iocb, iov, nr_segs, pos); |
857 | } | 853 | } |
858 | out: | ||
859 | dout("aio_read %p %llx.%llx dropping cap refs on %s = %d\n", | 854 | dout("aio_read %p %llx.%llx dropping cap refs on %s = %d\n", |
860 | inode, ceph_vinop(inode), ceph_cap_string(got), (int)ret); | 855 | inode, ceph_vinop(inode), ceph_cap_string(got), (int)ret); |
861 | ceph_put_cap_refs(ci, got); | 856 | ceph_put_cap_refs(ci, got); |
@@ -911,9 +906,7 @@ static ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
911 | 906 | ||
912 | mutex_lock(&inode->i_mutex); | 907 | mutex_lock(&inode->i_mutex); |
913 | 908 | ||
914 | err = generic_segment_checks(iov, &nr_segs, &count, VERIFY_READ); | 909 | count = iov_length(iov, nr_segs); |
915 | if (err) | ||
916 | goto out; | ||
917 | 910 | ||
918 | /* We can write back this queue in page reclaim */ | 911 | /* We can write back this queue in page reclaim */ |
919 | current->backing_dev_info = file->f_mapping->backing_dev_info; | 912 | current->backing_dev_info = file->f_mapping->backing_dev_info; |