From 809baab466a8f6b051078475bf07dcfa041fc839 Mon Sep 17 00:00:00 2001
From: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Date: Mon, 24 Jan 2011 00:57:10 +0000
Subject: [PATCH] --- yaml --- r: 232997 b: refs/heads/master c:
 abd30bb0af9d4671506502278e8631bed9e3c35c h: refs/heads/master i:   232995:
 f3ad06fcf8e65405d102ffcbdd6fc00bad49e069 v: v3

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

diff --git a/[refs] b/[refs]
index 8197ab8eeff8..3276d6b3af16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3612b49598c303cfb22a4b609427f829828e2427
+refs/heads/master: abd30bb0af9d4671506502278e8631bed9e3c35c
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 04b4fb9144a9..12dabe28cf54 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -2085,7 +2085,7 @@ static long btrfs_ioctl_trans_start(struct file *file)
 
 	ret = -ENOMEM;
 	trans = btrfs_start_ioctl_transaction(root, 0);
-	if (!trans)
+	if (IS_ERR(trans))
 		goto out_drop;
 
 	file->private_data = trans;