From 44d89ca42709bbbc322e361ad1179036ddf67f5a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 20 Mar 2010 11:22:10 +0000
Subject: [PATCH] --- yaml --- r: 189467 b: refs/heads/master c:
 6cf8bfbf5e88edfb09a2bf0631a067060f534592 h: refs/heads/master i:   189465:
 39be539f0b2ea64ce3f8fb1d490d8141aec2a592   189463:
 2f38a0bf8783a54ef373981cc2af398283689143 v: v3

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

diff --git a/[refs] b/[refs]
index 228a24c66c1a..4485f75220ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2b96929e2ca6914cf4a66cd8fe2a34c4a98277f
+refs/heads/master: 6cf8bfbf5e88edfb09a2bf0631a067060f534592
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 74d89133f768..2b7dd88fc54f 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -510,7 +510,7 @@ static int should_defrag_range(struct inode *inode, u64 start, u64 len,
 		em = btrfs_get_extent(inode, NULL, 0, start, len, 0);
 		unlock_extent(io_tree, start, start + len - 1, GFP_NOFS);
 
-		if (!em)
+		if (IS_ERR(em))
 			return 0;
 	}