NFSv4.1/pNFS: Cleanup pnfs_mark_matching_lsegs_invalid()

Make it more obvious what we're returning...

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 8e1d4229bf2df5280df215f8e22567c2c9ed1d73..f86f060f853dd95ef72ea20bd90ce01c2c5aff11 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -569,7 +569,7 @@ pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,
                            struct pnfs_layout_range *recall_range)
 {
        struct pnfs_layout_segment *lseg, *next;
-       int invalid = 0, removed = 0;
+       int remaining = 0;
 
        dprintk("%s:Begin lo %p\n", __func__, lo);
 
@@ -582,11 +582,11 @@ pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,
                                "offset %llu length %llu\n", __func__,
                                lseg, lseg->pls_range.iomode, lseg->pls_range.offset,
                                lseg->pls_range.length);
-                       invalid++;
-                       removed += mark_lseg_invalid(lseg, tmp_list);
+                       if (!mark_lseg_invalid(lseg, tmp_list))
+                               remaining++;
                }
-       dprintk("%s:Return %i\n", __func__, invalid - removed);
-       return invalid - removed;
+       dprintk("%s:Return %i\n", __func__, remaining);
+       return remaining;
 }
 
 /* note free_me must contain lsegs from a single layout_hdr */