projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kunit: run test suites only after module initialization completes
[platform/kernel/linux-rpi.git]
/
lib
/
iov_iter.c
diff --git
a/lib/iov_iter.c
b/lib/iov_iter.c
index
b31597b
..
27234a8
100644
(file)
--- a/
lib/iov_iter.c
+++ b/
lib/iov_iter.c
@@
-1654,14
+1654,14
@@
static ssize_t iov_iter_extract_bvec_pages(struct iov_iter *i,
size_t *offset0)
{
struct page **p, *page;
size_t *offset0)
{
struct page **p, *page;
- size_t skip = i->iov_offset, offset;
+ size_t skip = i->iov_offset, offset
, size
;
int k;
for (;;) {
if (i->nr_segs == 0)
return 0;
int k;
for (;;) {
if (i->nr_segs == 0)
return 0;
-
max
size = min(maxsize, i->bvec->bv_len - skip);
- if (
max
size)
+ size = min(maxsize, i->bvec->bv_len - skip);
+ if (size)
break;
i->iov_offset = 0;
i->nr_segs--;
break;
i->iov_offset = 0;
i->nr_segs--;
@@
-1674,16
+1674,16
@@
static ssize_t iov_iter_extract_bvec_pages(struct iov_iter *i,
offset = skip % PAGE_SIZE;
*offset0 = offset;
offset = skip % PAGE_SIZE;
*offset0 = offset;
- maxpages = want_pages_array(pages,
max
size, offset, maxpages);
+ maxpages = want_pages_array(pages, size, offset, maxpages);
if (!maxpages)
return -ENOMEM;
p = *pages;
for (k = 0; k < maxpages; k++)
p[k] = page + k;
if (!maxpages)
return -ENOMEM;
p = *pages;
for (k = 0; k < maxpages; k++)
p[k] = page + k;
-
maxsize = min_t(size_t, max
size, maxpages * PAGE_SIZE - offset);
- iov_iter_advance(i,
max
size);
- return
max
size;
+
size = min_t(size_t,
size, maxpages * PAGE_SIZE - offset);
+ iov_iter_advance(i, size);
+ return size;
}
/*
}
/*
@@
-1698,14
+1698,14
@@
static ssize_t iov_iter_extract_kvec_pages(struct iov_iter *i,
{
struct page **p, *page;
const void *kaddr;
{
struct page **p, *page;
const void *kaddr;
- size_t skip = i->iov_offset, offset, len;
+ size_t skip = i->iov_offset, offset, len
, size
;
int k;
for (;;) {
if (i->nr_segs == 0)
return 0;
int k;
for (;;) {
if (i->nr_segs == 0)
return 0;
-
max
size = min(maxsize, i->kvec->iov_len - skip);
- if (
max
size)
+ size = min(maxsize, i->kvec->iov_len - skip);
+ if (size)
break;
i->iov_offset = 0;
i->nr_segs--;
break;
i->iov_offset = 0;
i->nr_segs--;
@@
-1717,13
+1717,13
@@
static ssize_t iov_iter_extract_kvec_pages(struct iov_iter *i,
offset = (unsigned long)kaddr & ~PAGE_MASK;
*offset0 = offset;
offset = (unsigned long)kaddr & ~PAGE_MASK;
*offset0 = offset;
- maxpages = want_pages_array(pages,
max
size, offset, maxpages);
+ maxpages = want_pages_array(pages, size, offset, maxpages);
if (!maxpages)
return -ENOMEM;
p = *pages;
kaddr -= offset;
if (!maxpages)
return -ENOMEM;
p = *pages;
kaddr -= offset;
- len = offset +
max
size;
+ len = offset + size;
for (k = 0; k < maxpages; k++) {
size_t seg = min_t(size_t, len, PAGE_SIZE);
for (k = 0; k < maxpages; k++) {
size_t seg = min_t(size_t, len, PAGE_SIZE);
@@
-1737,9
+1737,9
@@
static ssize_t iov_iter_extract_kvec_pages(struct iov_iter *i,
kaddr += PAGE_SIZE;
}
kaddr += PAGE_SIZE;
}
-
maxsize = min_t(size_t, max
size, maxpages * PAGE_SIZE - offset);
- iov_iter_advance(i,
max
size);
- return
max
size;
+
size = min_t(size_t,
size, maxpages * PAGE_SIZE - offset);
+ iov_iter_advance(i, size);
+ return size;
}
/*
}
/*