Whamcloud - gitweb
LU-9679 osc: convert while to for in get_write_extents() 08/37608/3
authorNeilBrown <neilb@suse.com>
Sun, 16 Dec 2018 23:49:53 +0000 (10:49 +1100)
committerOleg Drokin <green@whamcloud.com>
Tue, 17 Mar 2020 03:40:15 +0000 (03:40 +0000)
This 'while' loop is really a 'for' loop in disguise.
So change it to 'for'.

Linux-Commit: d3ba9dc5cc66 ("lustre: osc_cache: convert while to for
in get_write_extents()")

Signed-off-by: Mr NeilBrown <neilb@suse.com>
Change-Id: Ifd4295cbdad400d2c49d83e0c54ddd0e4c5ae548
Reviewed-on: https://review.whamcloud.com/37608
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Patrick Farrell <farr0186@gmail.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
lustre/osc/osc_cache.c

index 884d14c..b74736c 100644 (file)
@@ -2026,19 +2026,16 @@ static unsigned int get_write_extents(struct osc_object *obj,
        if (data.erd_page_count == data.erd_max_pages)
                return data.erd_page_count;
 
-       ext = first_extent(obj);
-       while (ext != NULL) {
+       for (ext = first_extent(obj);
+            ext;
+            ext = next_extent(ext)) {
                if ((ext->oe_state != OES_CACHE) ||
                    /* this extent may be already in current rpclist */
-                   (!list_empty(&ext->oe_link) && ext->oe_owner != NULL)) {
-                       ext = next_extent(ext);
+                   (!list_empty(&ext->oe_link) && ext->oe_owner))
                        continue;
-               }
 
                if (!try_to_add_extent_for_io(cli, ext, &data))
                        return data.erd_page_count;
-
-               ext = next_extent(ext);
        }
        return data.erd_page_count;
 }