btrfs: combine extra if statements in btrfs_truncate_inode_items

We have

    if (del_item)
	    // do something
    else
	    // something else
    if (del_item)
	    // do yet another thing
    else
	    // something else entirely

back to back in btrfs_truncate_inode_items, collapse these two sets of
if statements into one.

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c
index f7b02abb681b0ac5be14d5d24ae0262ea6918ff0..ef1a9efe08c00f30284c7ee4f1b5b1a1a2a0ec7e 100644 (file)
--- a/fs/btrfs/inode-item.c
+++ b/fs/btrfs/inode-item.c
@@ -646,14 +646,11 @@ delete:
                        }
                }
 
-               if (del_item)
-                       control->last_size = found_key.offset;
-               else
-                       control->last_size = new_size;
                if (del_item) {
                        ASSERT(!pending_del_nr ||
                               ((path->slots[0] + 1) == pending_del_slot));
 
+                       control->last_size = found_key.offset;
                        if (!pending_del_nr) {
                                /* No pending yet, add ourselves */
                                pending_del_slot = path->slots[0];
@@ -665,6 +662,7 @@ delete:
                                pending_del_slot = path->slots[0];
                        }
                } else {
+                       control->last_size = new_size;
                        break;
                }
                should_throttle = false;