Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

Fix fs/btrfs/super.c conflict around #includes

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index db9fb3bc1e33..f3fd7e2cbc38 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -37,7 +37,6 @@
 #include <linux/ctype.h>
 #include <linux/namei.h>
 #include <linux/miscdevice.h>
-#include <linux/version.h>
 #include <linux/magic.h>
 #include "compat.h"
 #include "ctree.h"
@@ -583,17 +582,18 @@ 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 = -ENOTTY;
-        int len;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
         vol = kmalloc(sizeof(*vol), GFP_KERNEL);
+        if (!vol)
+                return -ENOMEM;
+
         if (copy_from_user(vol, (void __user *)arg, sizeof(*vol))) {
                 ret = -EFAULT;
                 goto out;
         }
-        len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
 
         switch (cmd) {
         case BTRFS_IOC_SCAN_DEV: