Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-drm-fsl-dcu.git] / fs / xfs / xfs_file.c

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index f0081f20e5c02a74416d4aa5cd7dfc927fd3309a..56afcdb2377d57c03bce9dc40b78c991184735a1 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -236,7 +236,6 @@ xfs_file_aio_read(
        ssize_t                 ret = 0;
        int                     ioflags = 0;
        xfs_fsize_t             n;
        ssize_t                 ret = 0;
        int                     ioflags = 0;
        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)
                ioflags |= IO_INVIS;
 
        if (file->f_mode & FMODE_NOCMTIME)
                ioflags |= IO_INVIS;
 

-       /* START copy & waste from filemap.c */
-       for (seg = 0; seg < nr_segs; seg++) {
-               const struct iovec *iv = &iovp[seg];
-
-               /*
-                * 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 */
+       ret = generic_segment_checks(iovp, &nr_segs, &size, VERIFY_WRITE);
+       if (ret < 0)
+               return ret;

 
        if (unlikely(ioflags & IO_ISDIRECT)) {
                xfs_buftarg_t   *target =
 
        if (unlikely(ioflags & IO_ISDIRECT)) {
                xfs_buftarg_t   *target =


@@ -273,7 +262,7 @@ xfs_file_aio_read(
                }
        }
 
                }
        }
 

-       n = XFS_MAXIOFFSET(mp) - iocb->ki_pos;
+       n = mp->m_super->s_maxbytes - iocb->ki_pos;

        if (n <= 0 || size == 0)
                return 0;
 
        if (n <= 0 || size == 0)
                return 0;