lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xfs: kill copy and paste segment checks in xfs_file_aio_read

Browse Source 
The generic segment check code now returns a count of the number of
bytes in the iovec, so we don't need to roll our own anymore.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
Dave Chinner
2012-06-08 15:45:44 +10:00
committed by Ben Myers
parent 32972383ca
commit 5276432997
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/xfs/xfs_file.c
View File

@@ -236,7 +236,6 @@ xfs_file_aio_read(
ssize_t ret = 0; ssize_t ret = 0;
int ioflags = 0; int ioflags = 0;
xfs_fsize_t n; xfs_fsize_t n;
unsigned long seg;
XFS_STATS_INC(xs_read_calls); XFS_STATS_INC(xs_read_calls);
@@ -247,19 +246,9 @@ xfs_file_aio_read(
if (file->f_mode & FMODE_NOCMTIME) if (file->f_mode & FMODE_NOCMTIME)
ioflags |= IO_INVIS; ioflags |= IO_INVIS;
/* START copy & waste from filemap.c */ ret = generic_segment_checks(iovp, &nr_segs, &size, VERIFY_WRITE);
for (seg = 0; seg < nr_segs; seg++) { if (ret < 0)
const struct iovec *iv = &iovp[seg]; return ret;
/*
* If any segment has a negative length, or the cumulative
* length ever wraps negative then return -EINVAL.
*/
size += iv->iov_len;
if (unlikely((ssize_t)(size|iv->iov_len) < 0))
return XFS_ERROR(-EINVAL);
}
/* END copy & waste from filemap.c */
if (unlikely(ioflags & IO_ISDIRECT)) { if (unlikely(ioflags & IO_ISDIRECT)) {
xfs_buftarg_t *target = xfs_buftarg_t *target =