Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e19d2db authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Greg Kroah-Hartman
Browse files

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: default avatarJavier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7b633f66

drivers/staging/spectra/ffsport.c

+14 −1
Original line number Diff line number Diff line
@@ -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,

};