From b919a2a48c9b9ccaaed1cd0409cc31d8dcdb3fac Mon Sep 17 00:00:00 2001
From: Linda Knippers <linda.knippers@hp.com>
Date: Mon, 9 Jun 2008 22:17:11 -0400
Subject: [PATCH] --- yaml --- r: 128787 b: refs/heads/master c:
 f819d837eea9829ed6c356fb88cdd0a170cbd947 h: refs/heads/master i:   128785:
 374696cb07f8455a504628dfc92005b515a4dbf1   128783:
 04727b1a65cdfceae41c01c3d0f05b53f0f99151 v: v3

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

diff --git a/[refs] b/[refs]
index 58c39912b2e9..7f12a05e51d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b96362cc8d314c935c335d5c3c42eb93c23166b
+refs/heads/master: f819d837eea9829ed6c356fb88cdd0a170cbd947
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 05029656e42e..77f44494e229 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -453,7 +453,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 {
 	struct btrfs_ioctl_vol_args *vol;
 	struct btrfs_fs_devices *fs_devices;
-	int ret;
+	int ret = 0;
 	int len;
 
 	vol = kmalloc(sizeof(*vol), GFP_KERNEL);
@@ -470,7 +470,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 	}
 out:
 	kfree(vol);
-	return 0;
+	return ret;
 }
 
 static void btrfs_write_super_lockfs(struct super_block *sb)