From a6edb5c38bc0e37f260442e6125d0437fc200fcc Mon Sep 17 00:00:00 2001
From: Gabriel de Perthuis <g2p.code@gmail.com>
Date: Mon, 6 May 2013 17:40:18 +0000
Subject: [PATCH] --- yaml --- r: 375807 b: refs/heads/master c:
 03b71c6ca6286625d8f1ed44aabab9b5bf5dac10 h: refs/heads/master i:   375805:
 6a48cbf406a1f81bf1deb714ad8196a50a4c3349   375803:
 c6cf6bc0fe4121154f5d3edd5d2fe8c599bf2902   375799:
 e9a00069f0d085e1918792dfd52e62f957c34a6f   375791:
 45a7a45553e04bc2e1cf791d1d6c8b9b20f8ff63   375775:
 e58621626bf74b6b35822733cbeccbed3225065d   375743:
 c87b830290cec8297db548cfe4cef4df18cc3fed   375679:
 cfa98ba06b4b3a7eef3a8e4e85873803b7adf337   375551:
 ce0d482f90f30a5b407ff5adbf308cd28b7453c0   375295:
 2ea8356490695bf042b2801550f592382e2841d5   374783:
 3c01f5abe4f43d6e08ea356d3cabbaa7a394ed73 v: v3

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

diff --git a/[refs] b/[refs]
index fe82494a5a7d..4a47ba9953da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a52f4cd2b1a863a42c1cb268b1cddad451cdfede
+refs/heads/master: 03b71c6ca6286625d8f1ed44aabab9b5bf5dac10
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 0de4a2fcfb24..0f81d67cdc8d 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -1801,7 +1801,11 @@ static noinline int copy_to_sk(struct btrfs_root *root,
 		item_off = btrfs_item_ptr_offset(leaf, i);
 		item_len = btrfs_item_size_nr(leaf, i);
 
-		if (item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
+		btrfs_item_key_to_cpu(leaf, key, i);
+		if (!key_in_sk(key, sk))
+			continue;
+
+		if (sizeof(sh) + item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
 			item_len = 0;
 
 		if (sizeof(sh) + item_len + *sk_offset >
@@ -1810,10 +1814,6 @@ static noinline int copy_to_sk(struct btrfs_root *root,
 			goto overflow;
 		}
 
-		btrfs_item_key_to_cpu(leaf, key, i);
-		if (!key_in_sk(key, sk))
-			continue;
-
 		sh.objectid = key->objectid;
 		sh.offset = key->offset;
 		sh.type = key->type;