From: Yan Zheng <zheng.yan@oracle.com>
Date: Fri, 24 Jul 2009 15:06:53 +0000 (-0400)
Subject: Btrfs: Fix ordering of key field checks in btrfs_previous_item
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a4eefbb745ec0e8a5b694ae3f40cc34082d8f61;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Btrfs: Fix ordering of key field checks in btrfs_previous_item

Check objectid of item before checking the item type, otherwise we may return
zero for a key that is actually too low.

Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 91572091c0a..978449af4cc 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -4296,10 +4296,10 @@ int btrfs_previous_item(struct btrfs_root *root,
 			path->slots[0]--;
 
 		btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
-		if (found_key.type == type)
-			return 0;
 		if (found_key.objectid < min_objectid)
 			break;
+		if (found_key.type == type)
+			return 0;
 		if (found_key.objectid == min_objectid &&
 		    found_key.type < type)
 			break;