diff options
| author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2010-07-10 00:07:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-23 18:15:34 -0700 |
| commit | 6e19d2db499b66aa7942bd36a7b55bb725379aae (patch) | |
| tree | bcf7247d336e95b32419a1d5b8743fef48dbd77f /drivers/staging | |
| parent | 7b633f6624ce4ea6199a54c2cad6c9e84164f8f5 (diff) | |
| download | kernel_samsung_smdk4412-6e19d2db499b66aa7942bd36a7b55bb725379aae.zip kernel_samsung_smdk4412-6e19d2db499b66aa7942bd36a7b55bb725379aae.tar.gz kernel_samsung_smdk4412-6e19d2db499b66aa7942bd36a7b55bb725379aae.tar.bz2 | |
Staging: spectra: don't use locked_ioctl, fix build
Last patch has a style problem. Sending the correct one. Sorry for the noise
Since BKL was removed from block ioctl handling code, locked_ioctl doesn't
exist anymore.
Using ioctl instead and doing the locking manually.
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/spectra/ffsport.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c index 00a0ac0..7b34635 100644 --- a/drivers/staging/spectra/ffsport.c +++ b/drivers/staging/spectra/ffsport.c @@ -27,6 +27,7 @@ #include <linux/kthread.h> #include <linux/log2.h> #include <linux/init.h> +#include <linux/smp_lock.h> /**** Helper functions used for Div, Remainder operation on u64 ****/ @@ -589,11 +590,23 @@ int GLOB_SBD_ioctl(struct block_device *bdev, fmode_t mode, return -ENOTTY; } +int GLOB_SBD_unlocked_ioctl(struct block_device *bdev, fmode_t mode, + unsigned int cmd, unsigned long arg) +{ + int ret; + + lock_kernel(); + ret = GLOB_SBD_ioctl(bdev, mode, cmd, arg); + unlock_kernel(); + + return ret; +} + static struct block_device_operations GLOB_SBD_ops = { .owner = THIS_MODULE, .open = GLOB_SBD_open, .release = GLOB_SBD_release, - .locked_ioctl = GLOB_SBD_ioctl, + .ioctl = GLOB_SBD_unlocked_ioctl, .getgeo = GLOB_SBD_getgeo, }; |