Christoph Hellwig
2007-May-18 04:13 UTC
[Ocfs2-devel] [PATCH] ocfs: use generic_segment_checks
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/fs/ocfs2/file.c
==================================================================---
linux-2.6.orig/fs/ocfs2/file.c 2007-05-18 12:10:10.000000000 +0200
+++ linux-2.6/fs/ocfs2/file.c 2007-05-18 12:11:01.000000000 +0200
@@ -1418,36 +1418,6 @@ out:
return total ? total : ret;
}
-static int ocfs2_check_iovec(const struct iovec *iov, size_t *counted,
- unsigned long *nr_segs)
-{
- size_t ocount; /* original count */
- unsigned long seg;
-
- ocount = 0;
- for (seg = 0; seg < *nr_segs; seg++) {
- const struct iovec *iv = &iov[seg];
-
- /*
- * If any segment has a negative length, or the cumulative
- * length ever wraps negative then return -EINVAL.
- */
- ocount += iv->iov_len;
- if (unlikely((ssize_t)(ocount|iv->iov_len) < 0))
- return -EINVAL;
- if (access_ok(VERIFY_READ, iv->iov_base, iv->iov_len))
- continue;
- if (seg == 0)
- return -EFAULT;
- *nr_segs = seg;
- ocount -= iv->iov_len; /* This segment is no good */
- break;
- }
-
- *counted = ocount;
- return 0;
-}
-
static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
const struct iovec *iov,
unsigned long nr_segs,
@@ -1470,7 +1440,7 @@ static ssize_t ocfs2_file_aio_write(stru
if (iocb->ki_left == 0)
return 0;
- ret = ocfs2_check_iovec(iov, &ocount, &nr_segs);
+ ret = generic_segment_checks(iov, &nr_segs, &ocount, VERIFY_READ);
if (ret)
return ret;
On Fri, May 18, 2007 at 01:12:40PM +0200, Christoph Hellwig wrote:> > Signed-off-by: Christoph Hellwig <hch@lst.de>Ok looks good. --Mark -- Mark Fasheh Senior Software Developer, Oracle mark.fasheh@oracle.com