diff options
Diffstat (limited to 'block/bsg.c')
-rw-r--r-- | block/bsg.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/bsg.c b/block/bsg.c index 0c00870553a3..f20d6a789d48 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/uio.h> | 20 | #include <linux/uio.h> |
21 | #include <linux/idr.h> | 21 | #include <linux/idr.h> |
22 | #include <linux/bsg.h> | 22 | #include <linux/bsg.h> |
23 | #include <linux/smp_lock.h> | ||
24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
25 | 24 | ||
26 | #include <scsi/scsi.h> | 25 | #include <scsi/scsi.h> |
@@ -843,9 +842,7 @@ static int bsg_open(struct inode *inode, struct file *file) | |||
843 | { | 842 | { |
844 | struct bsg_device *bd; | 843 | struct bsg_device *bd; |
845 | 844 | ||
846 | lock_kernel(); | ||
847 | bd = bsg_get_device(inode, file); | 845 | bd = bsg_get_device(inode, file); |
848 | unlock_kernel(); | ||
849 | 846 | ||
850 | if (IS_ERR(bd)) | 847 | if (IS_ERR(bd)) |
851 | return PTR_ERR(bd); | 848 | return PTR_ERR(bd); |
@@ -968,6 +965,7 @@ static const struct file_operations bsg_fops = { | |||
968 | .release = bsg_release, | 965 | .release = bsg_release, |
969 | .unlocked_ioctl = bsg_ioctl, | 966 | .unlocked_ioctl = bsg_ioctl, |
970 | .owner = THIS_MODULE, | 967 | .owner = THIS_MODULE, |
968 | .llseek = default_llseek, | ||
971 | }; | 969 | }; |
972 | 970 | ||
973 | void bsg_unregister_queue(struct request_queue *q) | 971 | void bsg_unregister_queue(struct request_queue *q) |