summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2022-05-05 12:37:49 +0200
committerAndreas Gruenbacher <agruenba@redhat.com>2022-05-13 22:00:22 +0200
commit6d22ff471070e21e24667be70764ee5abdfe5608 (patch)
tree181c875d1bdae7e5f921bf71a2438353759a1b3a /fs/gfs2
parentgfs2: Variable rename (diff)
downloadlinux-6d22ff471070e21e24667be70764ee5abdfe5608.tar.xz
linux-6d22ff471070e21e24667be70764ee5abdfe5608.zip
gfs2: Clean up use of fault_in_iov_iter_{read,write}able
No need to store the return value of the fault_in functions in separate variables. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/file.c26
1 files changed, 9 insertions, 17 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 4d36c01727ad..acc0c1d41564 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -846,12 +846,10 @@ retry_under_glock:
read = ret;
if (should_fault_in_pages(ret, to, &prev_count, &window_size)) {
- size_t leftover;
-
gfs2_holder_allow_demote(gh);
- leftover = fault_in_iov_iter_writeable(to, window_size);
+ window_size -= fault_in_iov_iter_writeable(to, window_size);
gfs2_holder_disallow_demote(gh);
- if (leftover != window_size) {
+ if (window_size) {
if (gfs2_holder_queued(gh))
goto retry_under_glock;
goto retry;
@@ -915,12 +913,10 @@ retry_under_glock:
written = ret;
if (should_fault_in_pages(ret, from, &prev_count, &window_size)) {
- size_t leftover;
-
gfs2_holder_allow_demote(gh);
- leftover = fault_in_iov_iter_readable(from, window_size);
+ window_size -= fault_in_iov_iter_readable(from, window_size);
gfs2_holder_disallow_demote(gh);
- if (leftover != window_size) {
+ if (window_size) {
if (gfs2_holder_queued(gh))
goto retry_under_glock;
goto retry;
@@ -983,12 +979,10 @@ retry_under_glock:
read += ret;
if (should_fault_in_pages(ret, to, &prev_count, &window_size)) {
- size_t leftover;
-
gfs2_holder_allow_demote(&gh);
- leftover = fault_in_iov_iter_writeable(to, window_size);
+ window_size -= fault_in_iov_iter_writeable(to, window_size);
gfs2_holder_disallow_demote(&gh);
- if (leftover != window_size) {
+ if (window_size) {
if (gfs2_holder_queued(&gh))
goto retry_under_glock;
goto retry;
@@ -1058,13 +1052,11 @@ retry_under_glock:
from->count = orig_count - written;
if (should_fault_in_pages(ret, from, &prev_count, &window_size)) {
- size_t leftover;
-
gfs2_holder_allow_demote(gh);
- leftover = fault_in_iov_iter_readable(from, window_size);
+ window_size -= fault_in_iov_iter_readable(from, window_size);
gfs2_holder_disallow_demote(gh);
- if (leftover != window_size) {
- from->count = min(from->count, window_size - leftover);
+ if (window_size) {
+ from->count = min(from->count, window_size);
if (gfs2_holder_queued(gh))
goto retry_under_glock;
goto retry;