diff options
author | Jonathan Corbet <corbet@lwn.net> | 2008-05-18 17:32:43 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 16:05:53 -0400 |
commit | f2b9857eee17797541b845782ade4d7a9d50f843 (patch) | |
tree | 914a00afee2ff953199f99f7cf869e3fd83b36bd /drivers/scsi/megaraid.c | |
parent | 0b2806768899dba5967bcd4a3b93eaed9a1dc4f3 (diff) |
Add a bunch of cycle_kernel_lock() calls
All of the open() functions which don't need the BKL on their face may
still depend on its acquisition to serialize opens against driver
initialization. So make those functions acquire then release the BKL to be
on the safe side.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/scsi/megaraid.c')
-rw-r--r-- | drivers/scsi/megaraid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index c9aa2c45a699..28c9da7d4a5c 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <linux/pci.h> | 46 | #include <linux/pci.h> |
47 | #include <linux/init.h> | 47 | #include <linux/init.h> |
48 | #include <linux/dma-mapping.h> | 48 | #include <linux/dma-mapping.h> |
49 | #include <linux/smp_lock.h> | ||
49 | #include <scsi/scsicam.h> | 50 | #include <scsi/scsicam.h> |
50 | 51 | ||
51 | #include "scsi.h" | 52 | #include "scsi.h" |
@@ -3273,12 +3274,11 @@ mega_init_scb(adapter_t *adapter) | |||
3273 | * | 3274 | * |
3274 | * Routines for the character/ioctl interface to the driver. Find out if this | 3275 | * Routines for the character/ioctl interface to the driver. Find out if this |
3275 | * is a valid open. | 3276 | * is a valid open. |
3276 | * | ||
3277 | * No BKL needed here. | ||
3278 | */ | 3277 | */ |
3279 | static int | 3278 | static int |
3280 | megadev_open (struct inode *inode, struct file *filep) | 3279 | megadev_open (struct inode *inode, struct file *filep) |
3281 | { | 3280 | { |
3281 | cycle_kernel_lock(); | ||
3282 | /* | 3282 | /* |
3283 | * Only allow superuser to access private ioctl interface | 3283 | * Only allow superuser to access private ioctl interface |
3284 | */ | 3284 | */ |