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>

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 4d36c01727ad8eb86da0921d2eac7319a120e0c8..acc0c1d415647e2562673ff461932c553461dda4 100644 (file)
--- 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;