tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'for-4.16/dm-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:

- Fix a DM multipath regression introduced in a v4.16-rc6 commit:
restore support for loading, and attaching, scsi_dh modules during
multipath table load. Otherwise some users may find themselves unable
to boot, as was reported today:

https://marc.info/?l=linux-scsi&m=152231276114962&w=2

- Fix a DM core ioctl permission check regression introduced in a
v4.16-rc5 commit.

* tag 'for-4.16/dm-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm: fix dropped return code from dm_get_bdev_for_ioctl
dm mpath: fix support for loading scsi_dh modules during table load

Linus Torvalds c2a98384 d89b9f50

+6 -4
+1 -1
drivers/md/dm-mpath.c
··· 887 887 888 888 q = bdev_get_queue(p->path.dev->bdev); 889 889 attached_handler_name = scsi_dh_attached_handler_name(q, GFP_KERNEL); 890 - if (attached_handler_name) { 890 + if (attached_handler_name || m->hw_handler_name) { 891 891 INIT_DELAYED_WORK(&p->activate_path, activate_path_work); 892 892 r = setup_scsi_dh(p->path.dev->bdev, m, attached_handler_name, &ti->error); 893 893 if (r) {
+5 -3
drivers/md/dm.c
··· 466 466 { 467 467 struct dm_target *tgt; 468 468 struct dm_table *map; 469 - int srcu_idx, r; 469 + int srcu_idx, r, r2; 470 470 471 471 retry: 472 472 r = -ENOTTY; ··· 492 492 goto out; 493 493 494 494 bdgrab(*bdev); 495 - r = blkdev_get(*bdev, *mode, _dm_claim_ptr); 496 - if (r < 0) 495 + r2 = blkdev_get(*bdev, *mode, _dm_claim_ptr); 496 + if (r2 < 0) { 497 + r = r2; 497 498 goto out; 499 + } 498 500 499 501 dm_put_live_table(md, srcu_idx); 500 502 return r;