Skip to contentSkip to conversation

btrfs: Eliminate insert label in add_falloc_range

PATCH In review Nikolay Borisov 2 participants 2 messages Jun 1, 2021 – Jun 2, 2021 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: Eliminate insert label in add_falloc_range

By way of inverting the list_empty conditional the insert label can be eliminated, making the function's flow entirely linear.

---
 fs/btrfs/file.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)
fs/btrfs/file.c +11 -12
index 2b28a3daa5a9..dcd3fd64dde7 100644
@@ -3036,19 +3036,18 @@ static int add_falloc_range(struct list_head *head, u64 start, u64 len)
 {
 	struct falloc_range *range = NULL;
 
-	if (list_empty(head))
-		goto insert;
-
-	/*
-	 * As fallocate iterate by bytenr order, we only need to check
-	 * the last range.
-	 */
-	range = list_last_entry(head, struct falloc_range, list);
-	if (range->start + range->len == start) {
-		range->len += len;
-		return 0;
+	if (!list_empty(head)) {
+		/*
+		 * As fallocate iterate by bytenr order, we only need to check
+		 * the last range.
+		 */
+		range = list_last_entry(head, struct falloc_range, list);
+		if (range->start + range->len == start) {
+			range->len += len;
+			return 0;
+		}
 	}
-insert:
+
 	range = kmalloc(sizeof(*range), GFP_KERNEL);
 	if (!range)
 		return -ENOMEM;

--
2.25.1