btrfs-progs: cleanup duplicate assignment of variable leaf for btrfs-image
authorGui Hecheng <guihc.fnst@cn.fujitsu.com>
Thu, 19 Jun 2014 01:46:00 +0000 (09:46 +0800)
committerDavid Sterba <dsterba@suse.cz>
Fri, 22 Aug 2014 12:43:10 +0000 (14:43 +0200)
The value of variable leaf in while loop don't have to be set
for every round. Just move it outside.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
btrfs-image.c

index 98d765a..3ca3b40 100644 (file)
@@ -1090,8 +1090,9 @@ static int copy_space_cache(struct btrfs_root *root,
                return ret;
        }
 
+       leaf = path->nodes[0];
+
        while (1) {
-               leaf = path->nodes[0];
                if (path->slots[0] >= btrfs_header_nritems(leaf)) {
                        ret = btrfs_next_leaf(root, path);
                        if (ret < 0) {
@@ -1157,8 +1158,9 @@ static int copy_from_extent_tree(struct metadump_struct *metadump,
        }
        ret = 0;
 
+       leaf = path->nodes[0];
+
        while (1) {
-               leaf = path->nodes[0];
                if (path->slots[0] >= btrfs_header_nritems(leaf)) {
                        ret = btrfs_next_leaf(extent_root, path);
                        if (ret < 0) {