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/ocfs2 | |
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/ocfs2')
-rw-r--r-- | fs/ocfs2/file.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index d6d78c2aa96e..d33c4ced0baf 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -2355,12 +2355,7 @@ relock: | |||
2355 | /* communicate with ocfs2_dio_end_io */ | 2355 | /* communicate with ocfs2_dio_end_io */ |
2356 | ocfs2_iocb_set_rw_locked(iocb, rw_level); | 2356 | ocfs2_iocb_set_rw_locked(iocb, rw_level); |
2357 | 2357 | ||
2358 | ret = generic_segment_checks(iov, &nr_segs, &ocount, | 2358 | count = ocount = iov_length(iov, nr_segs); |
2359 | VERIFY_READ); | ||
2360 | if (ret) | ||
2361 | goto out_dio; | ||
2362 | |||
2363 | count = ocount; | ||
2364 | ret = generic_write_checks(file, ppos, &count, | 2359 | ret = generic_write_checks(file, ppos, &count, |
2365 | S_ISBLK(inode->i_mode)); | 2360 | S_ISBLK(inode->i_mode)); |
2366 | if (ret) | 2361 | if (ret) |