---

yaml --- r: 276131 b: refs/heads/master c: ece7d20 h: refs/heads/master i: 276129: 53db639 276127: 423b277 v: v3
git-mirror · Nov 30, 2011 · 8502f49 · 8502f49
1 parent 06a4288
commit 8502f49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 	}