From 8497ec2fa4782a301c315cfbacd3332dae6c0ba0 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 18 Mar 2010 12:10:08 -0400
Subject: [PATCH] --- yaml --- r: 188235 b: refs/heads/master c:
 abc6e1341bda974e2d0eddb75f57a20ac18e9b33 h: refs/heads/master i:   188233:
 e988986af7c8cb2a52ca2807562ee365b2ebf4f7   188231:
 9c082e5494e30acdcd4d333924a7df3f4d211003 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/btrfs/ioctl.c | 39 +++++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index bdb89b2cbe3c..5a10e989f689 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fde62bffb576d384ea49a3aed3403d5609ee5bc
+refs/heads/master: abc6e1341bda974e2d0eddb75f57a20ac18e9b33
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 4329610b141b..291aa51ff420 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -914,17 +914,23 @@ static noinline int may_destroy_subvol(struct btrfs_root *root)
 static noinline int key_in_sk(struct btrfs_key *key,
 			      struct btrfs_ioctl_search_key *sk)
 {
-	if (key->objectid < sk->min_objectid)
-		return 0;
-	if (key->offset < sk->min_offset)
-		return 0;
-	if (key->type < sk->min_type)
-		return 0;
-	if (key->objectid > sk->max_objectid)
-		return 0;
-	if (key->type > sk->max_type)
+	struct btrfs_key test;
+	int ret;
+
+	test.objectid = sk->min_objectid;
+	test.type = sk->min_type;
+	test.offset = sk->min_offset;
+
+	ret = btrfs_comp_cpu_keys(key, &test);
+	if (ret < 0)
 		return 0;
-	if (key->offset > sk->max_offset)
+
+	test.objectid = sk->max_objectid;
+	test.type = sk->max_type;
+	test.offset = sk->max_offset;
+
+	ret = btrfs_comp_cpu_keys(key, &test);
+	if (ret > 0)
 		return 0;
 	return 1;
 }
@@ -998,13 +1004,18 @@ static noinline int copy_to_sk(struct btrfs_root *root,
 			break;
 	}
 advance_key:
-	if (key->offset < (u64)-1)
+	ret = 0;
+	if (key->offset < (u64)-1 && key->offset < sk->max_offset)
 		key->offset++;
-	else if (key->type < (u8)-1)
+	else if (key->type < (u8)-1 && key->type < sk->max_type) {
+		key->offset = 0;
 		key->type++;
-	else if (key->objectid < (u64)-1)
+	} else if (key->objectid < (u64)-1 && key->objectid < sk->max_objectid) {
+		key->offset = 0;
+		key->type = 0;
 		key->objectid++;
-	ret = 0;
+	} else
+		ret = 1;
 overflow:
 	*num_found += found;
 	return ret;