From 96ac05eadc61f01571bf3ccb685bc8dcd5a0dc9c Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@redhat.com>
Date: Fri, 10 Oct 2008 10:24:32 -0400
Subject: [PATCH] --- yaml --- r: 128979 b: refs/heads/master c:
 37d3cdddf5378606f6eab99982ca16819745d8f4 h: refs/heads/master i:   128977:
 3077bb4e90c4223dbfd2967ce8eb4aa74dfb56a8   128975:
 e1f60a745bb66798adf5156e403e9ab04b95c264 v: v3

---
 [refs]                            | 2 +-
 trunk/fs/btrfs/free-space-cache.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cc852e7f9920..3a99351642c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3dddf3fc82a1f5942c0928abfd114e9a8c0d0c8
+refs/heads/master: 37d3cdddf5378606f6eab99982ca16819745d8f4
diff --git a/trunk/fs/btrfs/free-space-cache.c b/trunk/fs/btrfs/free-space-cache.c
index f1d9b6bc23ba..96241f01fa0a 100644
--- a/trunk/fs/btrfs/free-space-cache.c
+++ b/trunk/fs/btrfs/free-space-cache.c
@@ -90,8 +90,8 @@ static struct btrfs_free_space *tree_search_offset(struct rb_root *root,
 				ret = entry;
 			n = n->rb_left;
 		} else if (offset > entry->offset) {
-			if (contains &&
-			    (entry->offset + entry->bytes - 1) >= offset) {
+			if ((entry->offset + entry->bytes - 1) >= offset &&
+			    bytes <= entry->bytes) {
 				ret = entry;
 				break;
 			}