Commit 0a4eefbb authored by Yan Zheng's avatar Yan Zheng Committed by Chris Mason
Browse files

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: default avatarYan Zheng <zheng.yan@oracle.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 1fcbac58

fs/btrfs/ctree.c

+2 −2
Original line number Diff line number Diff line
@@ -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;