From: Josef Bacik <josef@toxicpanda.com>
Date: Fri, 3 Dec 2021 22:18:18 +0000 (-0500)
Subject: btrfs: combine extra if statements in btrfs_truncate_inode_items
X-Git-Tag: v5.17-rc1~133^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0adbc6190c34b2e39f67b086cefc260e30045f48;p=thirdparty%2Fkernel%2Flinux.git

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 f7b02abb681b0..ef1a9efe08c00 100644
--- 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;