Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...

[firefly-linux-kernel-4.4.55.git] / drivers / ide / ide-disk_ioctl.c

diff --git a/drivers/ide/ide-disk_ioctl.c b/drivers/ide/ide-disk_ioctl.c
index 7b783dd7c0bec4bea0da3d1517ff0c3b18f3738f..ec94c66918f6c6cc2ee06e9e2e3fba4357606008 100644 (file)
--- a/drivers/ide/ide-disk_ioctl.c
+++ b/drivers/ide/ide-disk_ioctl.c
@@ -1,6 +1,7 @@
 #include <linux/kernel.h>
 #include <linux/ide.h>
 #include <linux/hdreg.h>
+#include <linux/smp_lock.h>
 
 #include "ide-disk.h"
 
@@ -18,9 +19,13 @@ int ide_disk_ioctl(ide_drive_t *drive, struct block_device *bdev, fmode_t mode,
 {
        int err;
 
+       lock_kernel();
        err = ide_setting_ioctl(drive, bdev, cmd, arg, ide_disk_ioctl_settings);
        if (err != -EOPNOTSUPP)
-               return err;
+               goto out;
 
-       return generic_ide_ioctl(drive, bdev, cmd, arg);
+       err = generic_ide_ioctl(drive, bdev, cmd, arg);
+out:
+       unlock_kernel();
+       return err;
 }