evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/lustre/llite: remove ll_file_get_iov_count

Browse source 
It exactly copies generic_segment_checks() except wrongly calling
access_ok(VERIFY_READ) for aio read range. Drop it and just call
generic_segment_checks() instead.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peng Tao 2013-12-04 01:54:57 +08:00 • committed by Greg Kroah-Hartman
parent 284c145e7e
commit 960edbe307
1 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/staging/lustre/lustre/llite/file.c
View file

@ -1148,38 +1148,6 @@ out:
return result;
}
/*
* XXX: exact copy from kernel code (__generic_file_aio_write_nolock)
*/
static int ll_file_get_iov_count(const struct iovec *iov,
unsigned long *nr_segs, size_t *count)
{
size_t cnt = 0;
unsigned long seg;
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.
*/
cnt += iv->iov_len;
if (unlikely((ssize_t)(cnt|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;
cnt -= iv->iov_len; /* This segment is no good */
break;
}
*count = cnt;
return 0;
}
static ssize_t ll_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos)
{
@ -1189,7 +1157,7 @@ static ssize_t ll_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
ssize_t result;
int refcheck;
result = ll_file_get_iov_count(iov, &nr_segs, &count);
result = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
if (result)
return result;
@ -1248,7 +1216,7 @@ static ssize_t ll_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
ssize_t result;
int refcheck;
result = ll_file_get_iov_count(iov, &nr_segs, &count);
result = generic_segment_checks(iov, &nr_segs, &count, VERIFY_READ);
if (result)
return result;