diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2021-11-03 16:07:36 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2021-11-03 16:07:36 +0100 |
| commit | 9642c8c44d0db43bc20a166dd70ac6d2ab3ce5b9 (patch) | |
| tree | 350fc5b827603da62c0706d1ef3a9f2bae977246 /fs/gfs2 | |
| parent | 78805cbe5d72ad27a56962a8072edbcb45ca1180 (diff) | |
| download | linux-9642c8c44d0db43bc20a166dd70ac6d2ab3ce5b9.tar.gz linux-9642c8c44d0db43bc20a166dd70ac6d2ab3ce5b9.tar.bz2 linux-9642c8c44d0db43bc20a166dd70ac6d2ab3ce5b9.zip | |
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: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index adafaaf7d24d..c486b702e00f 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -773,8 +773,8 @@ static inline bool should_fault_in_pages(ssize_t ret, struct iov_iter *i, size_t *prev_count, size_t *window_size) { - char __user *p = i->iov[0].iov_base + i->iov_offset; size_t count = iov_iter_count(i); + char __user *p; int pages = 1; if (likely(!count)) @@ -787,14 +787,14 @@ static inline bool should_fault_in_pages(ssize_t ret, struct iov_iter *i, if (*prev_count != count || !*window_size) { int pages, nr_dirtied; - pages = min_t(int, BIO_MAX_VECS, - DIV_ROUND_UP(iov_iter_count(i), PAGE_SIZE)); + pages = min_t(int, BIO_MAX_VECS, DIV_ROUND_UP(count, PAGE_SIZE)); nr_dirtied = max(current->nr_dirtied_pause - current->nr_dirtied, 1); pages = min(pages, nr_dirtied); } *prev_count = count; + p = i->iov[0].iov_base + i->iov_offset; *window_size = (size_t)PAGE_SIZE * pages - offset_in_page(p); return true; } |