From bca41dbb3ef3a79659f3548539d0da999ee5fe7b Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 29 May 2010 09:47:24 +0000
Subject: [PATCH] --- yaml --- r: 200361 b: refs/heads/master c:
 cf1e99a4e0daa4a5623cd71108509823b9ff2d30 h: refs/heads/master i:   200359:
 d6960b3764526d2677508f04731c46c8e15c9b06 v: v3

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

diff --git a/[refs] b/[refs]
index 5b4b32db71bb..cb0a2ce17fef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3140c9a34b44cd4013baae8704fdb34a93a44475
+refs/heads/master: cf1e99a4e0daa4a5623cd71108509823b9ff2d30
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 9f9a1d9607a7..4dbaf89b1337 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -1845,7 +1845,7 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)
 	dir_id = btrfs_super_root_dir(&root->fs_info->super_copy);
 	di = btrfs_lookup_dir_item(trans, root->fs_info->tree_root, path,
 				   dir_id, "default", 7, 1);
-	if (!di) {
+	if (IS_ERR_OR_NULL(di)) {
 		btrfs_free_path(path);
 		btrfs_end_transaction(trans, root);
 		printk(KERN_ERR "Umm, you don't have the default dir item, "