From 5ba1a90c9546ad67f064622a3474287ff664b844 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 29 Dec 2011 13:39:50 +0800
Subject: [PATCH] --- yaml --- r: 285981 b: refs/heads/master c:
 4da6f1a332f6c16b6594c7892f13c31459b9b1c8 h: refs/heads/master i:   285979:
 259fbf1934824a538a66471cbaadf2c7e4bc46cb v: v3

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

diff --git a/[refs] b/[refs]
index ca4cd4ef4337..583f439c4e1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f062abf089ff705e09bbaa6fa1e2fd7688a0f2ea
+refs/heads/master: 4da6f1a332f6c16b6594c7892f13c31459b9b1c8
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 9619fb03a5d6..fe8a60c865eb 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -254,7 +254,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
 		ip->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS);
 	}
 
-	trans = btrfs_join_transaction(root);
+	trans = btrfs_start_transaction(root, 1);
 	if (IS_ERR(trans)) {
 		ret = PTR_ERR(trans);
 		goto out_drop;