From 8502f49ba1bd32ff049a6e7de05db652741b65bf Mon Sep 17 00:00:00 2001
From: Mike Fleetwood <mike.fleetwood@googlemail.com>
Date: Fri, 18 Nov 2011 18:55:01 +0000
Subject: [PATCH] --- yaml --- r: 276131 b: refs/heads/master c:
 ece7d20e8be6730fbb29f4550de6b19b1a3a9387 h: refs/heads/master i:   276129:
 53db6391717890cfdf629a038748eab9feed3b72   276127:
 423b277b60b8f9bab5956f827f835dd0988761a2 v: v3

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

diff --git a/[refs] b/[refs]
index faec41f37e6e..b0a6274b2d0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa38a711a893accf5b5192f3d705a120deaa81e0
+refs/heads/master: ece7d20e8be6730fbb29f4550de6b19b1a3a9387
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index a90e749ed6d2..72d461656f60 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -1278,7 +1278,7 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root,
 		}
 		ret = btrfs_grow_device(trans, device, new_size);
 		btrfs_commit_transaction(trans, root);
-	} else {
+	} else if (new_size < old_size) {
 		ret = btrfs_shrink_device(device, new_size);
 	}