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

Commit bbeba4c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev:
  [PATCH] fix bogus argument of blkdev_put() in pktcdvd
  [PATCH 2/2] documnt FMODE_ constants
  [PATCH 1/2] kill FMODE_NDELAY_NOW
  [PATCH] clean up blkdev_get a little bit
  [PATCH] Fix block dev compat ioctl handling
  [PATCH] kill obsolete temporary comment in swsusp_close()
parents 6df944c5 2cbed890

block/compat_ioctl.c

+30 −1
Original line number Diff line number Diff line
@@ -677,6 +677,29 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, 
	case DVD_WRITE_STRUCT:

	case DVD_AUTH:

		arg = (unsigned long)compat_ptr(arg);

	/* These intepret arg as an unsigned long, not as a pointer,

	 * so we must not do compat_ptr() conversion. */

	case HDIO_SET_MULTCOUNT:

	case HDIO_SET_UNMASKINTR:

	case HDIO_SET_KEEPSETTINGS:

	case HDIO_SET_32BIT:

	case HDIO_SET_NOWERR:

	case HDIO_SET_DMA:

	case HDIO_SET_PIO_MODE:

	case HDIO_SET_NICE:

	case HDIO_SET_WCACHE:

	case HDIO_SET_ACOUSTIC:

	case HDIO_SET_BUSSTATE:

	case HDIO_SET_ADDRESS:

	case CDROMEJECT_SW:

	case CDROM_SET_OPTIONS:

	case CDROM_CLEAR_OPTIONS:

	case CDROM_SELECT_SPEED:

	case CDROM_SELECT_DISC:

	case CDROM_MEDIA_CHANGED:

	case CDROM_DRIVE_STATUS:

	case CDROM_LOCKDOOR:

	case CDROM_DEBUG:

		break;

	default:

		/* unknown ioctl number */
@@ -699,8 +722,14 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	struct backing_dev_info *bdi;

	loff_t size;



	/*

	 * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have

	 * to updated it before every ioctl.

	 */

	if (file->f_flags & O_NDELAY)

		mode |= FMODE_NDELAY_NOW;

		mode |= FMODE_NDELAY;

	else

		mode &= ~FMODE_NDELAY;



	switch (cmd) {

	case HDIO_GETGEO:

drivers/block/pktcdvd.c

+2 −2
Original line number Diff line number Diff line
@@ -2790,7 +2790,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) 
	return 0;



out_mem:

	blkdev_put(bdev, FMODE_READ|FMODE_WRITE);

	blkdev_put(bdev, FMODE_READ | FMODE_NDELAY);

	/* This is safe: open() is still holding a reference. */

	module_put(THIS_MODULE);

	return ret;
@@ -2975,7 +2975,7 @@ static int pkt_remove_dev(dev_t pkt_dev) 
	pkt_debugfs_dev_remove(pd);

	pkt_sysfs_dev_remove(pd);



	blkdev_put(pd->bdev, FMODE_READ|FMODE_WRITE);

	blkdev_put(pd->bdev, FMODE_READ | FMODE_NDELAY);



	remove_proc_entry(pd->name, pkt_proc);

	DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name);

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, 
	 * access to the device is prohibited.

	 */

	error = scsi_nonblockable_ioctl(sdp, cmd, p,

					(mode & FMODE_NDELAY_NOW) != 0);

					(mode & FMODE_NDELAY) != 0);

	if (!scsi_block_when_processing_errors(sdp) || !error)

		return error;

drivers/scsi/sr.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, 
	 * if it doesn't recognise the ioctl

	 */

	ret = scsi_nonblockable_ioctl(sdev, cmd, argp,

					(mode & FMODE_NDELAY_NOW) != 0);

					(mode & FMODE_NDELAY) != 0);

	if (ret != -ENODEV)

		return ret;

	return scsi_ioctl(sdev, cmd, argp);

fs/block_dev.c

+16 −5
Original line number Diff line number Diff line
@@ -1135,12 +1135,15 @@ static int blkdev_open(struct inode * inode, struct file * filp) 
	if (res)

		return res;



	if (!(filp->f_mode & FMODE_EXCL))

		return 0;

	if (filp->f_mode & FMODE_EXCL) {

		res = bd_claim(bdev, filp);

		if (res)

			goto out_blkdev_put;

	}



	if (!(res = bd_claim(bdev, filp)))

	return 0;



 out_blkdev_put:

	blkdev_put(bdev, filp->f_mode);

	return res;

}
@@ -1203,8 +1206,16 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
{

	struct block_device *bdev = I_BDEV(file->f_mapping->host);

	fmode_t mode = file->f_mode;



	/*

	 * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have

	 * to updated it before every ioctl.

	 */

	if (file->f_flags & O_NDELAY)

		mode |= FMODE_NDELAY_NOW;

		mode |= FMODE_NDELAY;

	else

		mode &= ~FMODE_NDELAY;



	return blkdev_ioctl(bdev, mode, cmd, arg);

}