---

yaml --- r: 128787 b: refs/heads/master c: f819d83 h: refs/heads/master i: 128785: 374696c 128783: 04727b1 v: v3
git-mirror · Sep 25, 2008 · b919a2a · b919a2a
1 parent ff37c98
commit b919a2a
Show file tree

Hide file tree

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