Merge branch 'topic/quirk-cleanup' into topic/hda

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0a14b495532f..db9fb3bc1e33 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -38,6 +38,7 @@
 #include <linux/namei.h>
 #include <linux/miscdevice.h>
 #include <linux/version.h>
+#include <linux/magic.h>
 #include "compat.h"
 #include "ctree.h"
 #include "disk-io.h"
@@ -51,7 +52,6 @@
 #include "export.h"
 #include "compression.h"
 
-#define BTRFS_SUPER_MAGIC 0x9123683E
 
 static struct super_operations btrfs_super_ops;
 
@@ -582,7 +582,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 = 0;
+        int ret = -ENOTTY;
         int len;
 
         if (!capable(CAP_SYS_ADMIN))
@@ -594,6 +594,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
                 goto out;
         }
         len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
+
         switch (cmd) {
         case BTRFS_IOC_SCAN_DEV:
                 ret = btrfs_scan_one_device(vol->name, FMODE_READ,