From 2ac9cb4812ccf832b5cea1a51bb9bf620be76ae0 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Fri, 4 Mar 2011 14:41:41 -0500
Subject: [PATCH] --- yaml --- r: 243150 b: refs/heads/master c:
 930f028abe39dfd0849b53131d19c4b67aacbe67 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2c9105e8b82d..5a956e6182ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0cd846e9221811d87047f1428cf5226e7236efe
+refs/heads/master: 930f028abe39dfd0849b53131d19c4b67aacbe67
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 206b60362cec..64d57e032b4e 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -3640,10 +3640,7 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
 
 static int btrfs_setsize(struct inode *inode, loff_t newsize)
 {
-	struct btrfs_root *root = BTRFS_I(inode)->root;
-	struct btrfs_trans_handle *trans;
 	loff_t oldsize = i_size_read(inode);
-	unsigned long nr;
 	int ret;
 
 	if (newsize == oldsize)
@@ -3659,18 +3656,7 @@ static int btrfs_setsize(struct inode *inode, loff_t newsize)
 			return ret;
 		}
 
-		trans = btrfs_start_transaction(root, 1);
-		if (IS_ERR(trans))
-			return PTR_ERR(trans);
-
-		ret = btrfs_update_inode(trans, root, inode);
-		if (ret) {
-			btrfs_end_transaction(trans, root);
-			return ret;
-		}
-		nr = trans->blocks_used;
-		btrfs_end_transaction(trans, root);
-		btrfs_btree_balance_dirty(root, nr);
+		mark_inode_dirty(inode);
 	} else {
 
 		/*