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

Commit 8a6cfeb6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jens Axboe
Browse files

block: push down BKL into .locked_ioctl 



As a preparation for the removal of the big kernel
lock in the block layer, this removes the BKL
from the common ioctl handling code, moving it
into every single driver still using it.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 34484062

block/ioctl.c

+1 −10
Original line number Diff line number Diff line
@@ -163,18 +163,10 @@ int __blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, 
			unsigned cmd, unsigned long arg)

{

	struct gendisk *disk = bdev->bd_disk;

	int ret;



	if (disk->fops->ioctl)

		return disk->fops->ioctl(bdev, mode, cmd, arg);



	if (disk->fops->locked_ioctl) {

		lock_kernel();

		ret = disk->fops->locked_ioctl(bdev, mode, cmd, arg);

		unlock_kernel();

		return ret;

	}



	return -ENOTTY;

}

/*
@@ -185,8 +177,7 @@ int __blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, 
EXPORT_SYMBOL_GPL(__blkdev_driver_ioctl);



/*

 * always keep this in sync with compat_blkdev_ioctl() and

 * compat_blkdev_locked_ioctl()

 * always keep this in sync with compat_blkdev_ioctl()

 */

int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,

			unsigned long arg)

drivers/block/amiflop.c

+15 −2
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <linux/hdreg.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/smp_lock.h>

#include <linux/amifdreg.h>

#include <linux/amifd.h>

#include <linux/buffer_head.h>
@@ -1423,7 +1424,7 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo) 
	return 0;

}



static int fd_ioctl(struct block_device *bdev, fmode_t mode,

static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,

		    unsigned int cmd, unsigned long param)

{

	struct amiga_floppy_struct *p = bdev->bd_disk->private_data;
@@ -1500,6 +1501,18 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, 
	return 0;

}



static int fd_ioctl(struct block_device *bdev, fmode_t mode,

			     unsigned int cmd, unsigned long param)

{

	int ret;



	lock_kernel();

	ret = fd_locked_ioctl(bdev, mode, cmd, param);

	unlock_kernel();



	return ret;

}



static void fd_probe(int dev)

{

	unsigned long code;
@@ -1638,7 +1651,7 @@ static const struct block_device_operations floppy_fops = { 
	.owner		= THIS_MODULE,

	.open		= floppy_open,

	.release	= floppy_release,

	.locked_ioctl	= fd_ioctl,

	.ioctl		= fd_ioctl,

	.getgeo		= fd_getgeo,

	.media_changed	= amiga_floppy_change,

};

drivers/block/ataflop.c

+15 −3
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <linux/delay.h>

#include <linux/init.h>

#include <linux/blkdev.h>

#include <linux/smp_lock.h>



#include <asm/atafd.h>

#include <asm/atafdreg.h>
@@ -359,7 +360,7 @@ static void finish_fdc( void ); 
static void finish_fdc_done( int dummy );

static void setup_req_params( int drive );

static void redo_fd_request( void);

static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int

static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int

                     cmd, unsigned long param);

static void fd_probe( int drive );

static int fd_test_drive_present( int drive );
@@ -1480,7 +1481,7 @@ void do_fd_request(struct request_queue * q) 
	atari_enable_irq( IRQ_MFP_FDC );

}



static int fd_ioctl(struct block_device *bdev, fmode_t mode,

static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,

		    unsigned int cmd, unsigned long param)

{

	struct gendisk *disk = bdev->bd_disk;
@@ -1665,6 +1666,17 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, 
	}

}



static int fd_ioctl(struct block_device *bdev, fmode_t mode,

			     unsigned int cmd, unsigned long arg)

{

	int ret;



	lock_kernel();

	ret = fd_locked_ioctl(bdev, mode, cmd, arg);

	unlock_kernel();



	return ret;

}



/* Initialize the 'unit' variable for drive 'drive' */
@@ -1855,7 +1867,7 @@ static const struct block_device_operations floppy_fops = { 
	.owner		= THIS_MODULE,

	.open		= floppy_open,

	.release	= floppy_release,

	.locked_ioctl	= fd_ioctl,

	.ioctl		= fd_ioctl,

	.media_changed	= check_floppy_change,

	.revalidate_disk= floppy_revalidate,

};

drivers/block/brd.c

+4 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/blkdev.h>

#include <linux/bio.h>

#include <linux/highmem.h>

#include <linux/smp_lock.h>

#include <linux/radix-tree.h>

#include <linux/buffer_head.h> /* invalidate_bh_lrus() */

#include <linux/slab.h>
@@ -401,6 +402,7 @@ static int brd_ioctl(struct block_device *bdev, fmode_t mode, 
	 * ram device BLKFLSBUF has special semantics, we want to actually

	 * release and destroy the ramdisk data.

	 */

	lock_kernel();

	mutex_lock(&bdev->bd_mutex);

	error = -EBUSY;

	if (bdev->bd_openers <= 1) {
@@ -417,13 +419,14 @@ static int brd_ioctl(struct block_device *bdev, fmode_t mode, 
		error = 0;

	}

	mutex_unlock(&bdev->bd_mutex);

	unlock_kernel();



	return error;

}



static const struct block_device_operations brd_fops = {

	.owner =		THIS_MODULE,

	.locked_ioctl =		brd_ioctl,

	.ioctl =		brd_ioctl,

#ifdef CONFIG_BLK_DEV_XIP

	.direct_access =	brd_direct_access,

#endif

drivers/block/cciss.c

+5 −3
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ static irqreturn_t do_cciss_intx(int irq, void *dev_id); 
static irqreturn_t do_cciss_msix_intr(int irq, void *dev_id);

static int cciss_open(struct block_device *bdev, fmode_t mode);

static int cciss_release(struct gendisk *disk, fmode_t mode);

static int do_ioctl(struct block_device *bdev, fmode_t mode,

		    unsigned int cmd, unsigned long arg);

static int cciss_ioctl(struct block_device *bdev, fmode_t mode,

		       unsigned int cmd, unsigned long arg);

static int cciss_getgeo(struct block_device *bdev, struct hd_geometry *geo);
@@ -237,7 +239,7 @@ static const struct block_device_operations cciss_fops = { 
	.owner = THIS_MODULE,

	.open = cciss_open,

	.release = cciss_release,

	.locked_ioctl = cciss_ioctl,

	.ioctl = do_ioctl,

	.getgeo = cciss_getgeo,

#ifdef CONFIG_COMPAT

	.compat_ioctl = cciss_compat_ioctl,
@@ -1057,8 +1059,6 @@ static int cciss_release(struct gendisk *disk, fmode_t mode) 
	return 0;

}



#ifdef CONFIG_COMPAT



static int do_ioctl(struct block_device *bdev, fmode_t mode,

		    unsigned cmd, unsigned long arg)

{
@@ -1069,6 +1069,8 @@ static int do_ioctl(struct block_device *bdev, fmode_t mode, 
	return ret;

}



#ifdef CONFIG_COMPAT



static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,

				  unsigned cmd, unsigned long arg);

static int cciss_ioctl32_big_passthru(struct block_device *bdev, fmode_t mode,