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

Commit 53d8ab29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block 

Pull block IO driver changes from Jens Axboe:

 - bcache update from Kent Overstreet.

 - two bcache fixes from Nicholas Swenson.

 - cciss pci init error fix from Andrew.

 - underflow fix in the parallel IDE pg_write code from Dan Carpenter.
   I'm sure the 1 (or 0) users of that are now happy.

 - two PCI related fixes for sx8 from Jingoo Han.

 - floppy init fix for first block read from Jiri Kosina.

 - pktcdvd error return miss fix from Julia Lawall.

 - removal of IRQF_SHARED from the SEGA Dreamcast CD-ROM code from
   Michael Opdenacker.

 - comment typo fix for the loop driver from Olaf Hering.

 - potential oops fix for null_blk from Raghavendra K T.

 - two fixes from Sam Bradshaw (Micron) for the mtip32xx driver, fixing
   an OOM problem and a problem with handling security locked conditions

* 'for-3.14/drivers' of git://git.kernel.dk/linux-block: (47 commits)
  mg_disk: Spelling s/finised/finished/
  null_blk: Null pointer deference problem in alloc_page_buffers
  mtip32xx: Correctly handle security locked condition
  mtip32xx: Make SGL container per-command to eliminate high order dma allocation
  drivers/block/loop.c: fix comment typo in loop_config_discard
  drivers/block/cciss.c:cciss_init_one(): use proper errnos
  drivers/block/paride/pg.c: underflow bug in pg_write()
  drivers/block/sx8.c: remove unnecessary pci_set_drvdata()
  drivers/block/sx8.c: use module_pci_driver()
  floppy: bail out in open() if drive is not responding to block0 read
  bcache: Fix auxiliary search trees for key size > cacheline size
  bcache: Don't return -EINTR when insert finished
  bcache: Improve bucket_prio() calculation
  bcache: Add bch_bkey_equal_header()
  bcache: update bch_bkey_try_merge
  bcache: Move insert_fixup() to btree_keys_ops
  bcache: Convert sorting to btree_keys
  bcache: Convert debug code to btree_keys
  bcache: Convert btree_iter to struct btree_keys
  bcache: Refactor bset_tree sysfs stats
  ...
parents f568849e 14424be4

block/blk-settings.c

+4 −0
Original line number Diff line number Diff line
@@ -592,6 +592,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 
		ret = -1;

	}



	t->raid_partial_stripes_expensive =

		max(t->raid_partial_stripes_expensive,

		    b->raid_partial_stripes_expensive);



	/* Find lowest common alignment_offset */

	t->alignment_offset = lcm(t->alignment_offset, alignment)

		& (max(t->physical_block_size, t->io_min) - 1);

drivers/block/cciss.c

+2 −2
Original line number Diff line number Diff line
@@ -5004,7 +5004,7 @@ static int cciss_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	i = alloc_cciss_hba(pdev);

	if (i < 0)

		return -1;

		return -ENOMEM;



	h = hba[i];

	h->pdev = pdev;
@@ -5205,7 +5205,7 @@ static int cciss_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 */

	pci_set_drvdata(pdev, NULL);

	free_hba(h);

	return -1;

	return -ENODEV;

}



static void cciss_shutdown(struct pci_dev *pdev)

drivers/block/floppy.c

+27 −9
Original line number Diff line number Diff line
@@ -3691,9 +3691,12 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
	if (!(mode & FMODE_NDELAY)) {

		if (mode & (FMODE_READ|FMODE_WRITE)) {

			UDRS->last_checked = 0;

			clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);

			check_disk_change(bdev);

			if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))

				goto out;

			if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))

				goto out;

		}

		res = -EROFS;

		if ((mode & FMODE_WRITE) &&
@@ -3746,17 +3749,29 @@ static unsigned int floppy_check_events(struct gendisk *disk, 
 * a disk in the drive, and whether that disk is writable.

 */



static void floppy_rb0_complete(struct bio *bio, int err)

struct rb0_cbdata {

	int drive;

	struct completion complete;

};



static void floppy_rb0_cb(struct bio *bio, int err)

{

	complete((struct completion *)bio->bi_private);

	struct rb0_cbdata *cbdata = (struct rb0_cbdata *)bio->bi_private;

	int drive = cbdata->drive;



	if (err) {

		pr_info("floppy: error %d while reading block 0", err);

		set_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);

	}

	complete(&cbdata->complete);

}



static int __floppy_read_block_0(struct block_device *bdev)

static int __floppy_read_block_0(struct block_device *bdev, int drive)

{

	struct bio bio;

	struct bio_vec bio_vec;

	struct completion complete;

	struct page *page;

	struct rb0_cbdata cbdata;

	size_t size;



	page = alloc_page(GFP_NOIO);
@@ -3769,6 +3784,8 @@ static int __floppy_read_block_0(struct block_device *bdev) 
	if (!size)

		size = 1024;



	cbdata.drive = drive;



	bio_init(&bio);

	bio.bi_io_vec = &bio_vec;

	bio_vec.bv_page = page;
@@ -3779,13 +3796,14 @@ static int __floppy_read_block_0(struct block_device *bdev) 
	bio.bi_bdev = bdev;

	bio.bi_iter.bi_sector = 0;

	bio.bi_flags = (1 << BIO_QUIET);

	init_completion(&complete);

	bio.bi_private = &complete;

	bio.bi_end_io = floppy_rb0_complete;

	bio.bi_private = &cbdata;

	bio.bi_end_io = floppy_rb0_cb;



	submit_bio(READ, &bio);

	process_fd_request();

	wait_for_completion(&complete);



	init_completion(&cbdata.complete);

	wait_for_completion(&cbdata.complete);



	__free_page(page);
@@ -3827,7 +3845,7 @@ static int floppy_revalidate(struct gendisk *disk) 
			UDRS->generation++;

		if (drive_no_geom(drive)) {

			/* auto-sensing */

			res = __floppy_read_block_0(opened_bdev[drive]);

			res = __floppy_read_block_0(opened_bdev[drive], drive);

		} else {

			if (cf)

				poll_drive(false, FD_RAW_NEED_DISK);

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ static void loop_config_discard(struct loop_device *lo) 


	/*

	 * We use punch hole to reclaim the free space used by the

	 * image a.k.a. discard. However we do support discard if

	 * image a.k.a. discard. However we do not support discard if

	 * encryption is enabled, because it may give an attacker

	 * useful information.

	 */

drivers/block/mg_disk.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static int mg_probe(struct platform_device *plat_dev) 


	/* disk reset */

	if (prv_data->dev_attr == MG_STORAGE_DEV) {

		/* If POR seq. not yet finised, wait */

		/* If POR seq. not yet finished, wait */

		err = mg_wait_rstout(host->rstout, MG_TMAX_RSTOUT);

		if (err)

			goto probe_err_3b;