Commit 9642c8c4 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher

gfs2: Only dereference i->iov when iter_is_iovec(i)

Only dereference i->iov after establishing that i is of type ITER_IOVEC.
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 78805cbe
...@@ -773,8 +773,8 @@ static inline bool should_fault_in_pages(ssize_t ret, struct iov_iter *i, ...@@ -773,8 +773,8 @@ static inline bool should_fault_in_pages(ssize_t ret, struct iov_iter *i,
size_t *prev_count, size_t *prev_count,
size_t *window_size) size_t *window_size)
{ {
char __user *p = i->iov[0].iov_base + i->iov_offset;
size_t count = iov_iter_count(i); size_t count = iov_iter_count(i);
char __user *p;
int pages = 1; int pages = 1;
if (likely(!count)) if (likely(!count))
...@@ -787,14 +787,14 @@ static inline bool should_fault_in_pages(ssize_t ret, struct iov_iter *i, ...@@ -787,14 +787,14 @@ static inline bool should_fault_in_pages(ssize_t ret, struct iov_iter *i,
if (*prev_count != count || !*window_size) { if (*prev_count != count || !*window_size) {
int pages, nr_dirtied; int pages, nr_dirtied;
pages = min_t(int, BIO_MAX_VECS, pages = min_t(int, BIO_MAX_VECS, DIV_ROUND_UP(count, PAGE_SIZE));
DIV_ROUND_UP(iov_iter_count(i), PAGE_SIZE));
nr_dirtied = max(current->nr_dirtied_pause - nr_dirtied = max(current->nr_dirtied_pause -
current->nr_dirtied, 1); current->nr_dirtied, 1);
pages = min(pages, nr_dirtied); pages = min(pages, nr_dirtied);
} }
*prev_count = count; *prev_count = count;
p = i->iov[0].iov_base + i->iov_offset;
*window_size = (size_t)PAGE_SIZE * pages - offset_in_page(p); *window_size = (size_t)PAGE_SIZE * pages - offset_in_page(p);
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment