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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (39 commits)
  [SCSI] sd: fix compile failure with CONFIG_BLK_DEV_INTEGRITY=n
  libiscsi: fix locking in iscsi_eh_device_reset
  libiscsi: check reason why we are stopping iscsi session to determine error value
  [SCSI] iscsi_tcp: return a descriptive error value during connection errors
  [SCSI] libiscsi: rename host reset to target reset
  [SCSI] iscsi class: fix endpoint id handling
  [SCSI] libiscsi: Support drivers initiating session removal
  [SCSI] libiscsi: fix data corruption when target has to resend data-in packets
  [SCSI] sd: Switch kernel printing level for DIF messages
  [SCSI] sd: Correctly handle all combinations of DIF and DIX
  [SCSI] sd: Always print actual protection_type
  [SCSI] sd: Issue correct protection operation
  [SCSI] scsi_error: fix target reset handling
  [SCSI] lpfc 8.2.8 v2 : Add statistical reporting control and additional fc vendor events
  [SCSI] lpfc 8.2.8 v2 : Add sysfs control of target queue depth handling
  [SCSI] lpfc 8.2.8 v2 : Revert target busy in favor of transport disrupted
  [SCSI] scsi_dh_alua: remove REQ_NOMERGE
  [SCSI] lpfc 8.2.8 : update driver version to 8.2.8
  [SCSI] lpfc 8.2.8 : Add MSI-X support
  [SCSI] lpfc 8.2.8 : Update driver to use new Host byte error code DID_TRANSPORT_DISRUPTED
  ...
parents b225ee5b 4c393e6e

block/blk-core.c

+9 −2
Original line number Diff line number Diff line
@@ -1075,8 +1075,15 @@ void init_request_from_bio(struct request *req, struct bio *bio) 
	/*

	 * inherit FAILFAST from bio (for read-ahead, and explicit FAILFAST)

	 */

	if (bio_rw_ahead(bio) || bio_failfast(bio))

		req->cmd_flags |= REQ_FAILFAST;

	if (bio_rw_ahead(bio))

		req->cmd_flags |= (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |

				   REQ_FAILFAST_DRIVER);

	if (bio_failfast_dev(bio))

		req->cmd_flags |= REQ_FAILFAST_DEV;

	if (bio_failfast_transport(bio))

		req->cmd_flags |= REQ_FAILFAST_TRANSPORT;

	if (bio_failfast_driver(bio))

		req->cmd_flags |= REQ_FAILFAST_DRIVER;



	/*

	 * REQ_BARRIER implies no merging, but lets make it explicit

drivers/infiniband/ulp/iser/iscsi_iser.c

+2 −1
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ static void iscsi_iser_session_destroy(struct iscsi_cls_session *cls_session) 
{

	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);



	iscsi_session_teardown(cls_session);

	iscsi_host_remove(shost);

	iscsi_host_free(shost);

}
@@ -597,7 +598,7 @@ static struct scsi_host_template iscsi_iser_sht = { 
	.cmd_per_lun            = ISCSI_MAX_CMD_PER_LUN,

	.eh_abort_handler       = iscsi_eh_abort,

	.eh_device_reset_handler= iscsi_eh_device_reset,

	.eh_host_reset_handler	= iscsi_eh_host_reset,

	.eh_target_reset_handler= iscsi_eh_target_reset,

	.use_clustering         = DISABLE_CLUSTERING,

	.proc_name              = "iscsi_iser",

	.this_id                = -1,

drivers/md/dm-mpath.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int multipath_map(struct dm_target *ti, struct bio *bio, 
	dm_bio_record(&mpio->details, bio);



	map_context->ptr = mpio;

	bio->bi_rw |= (1 << BIO_RW_FAILFAST);

	bio->bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT);

	r = map_io(m, bio, mpio, 0);

	if (r < 0 || r == DM_MAPIO_REQUEUE)

		mempool_free(mpio, m->mpio_pool);

drivers/md/multipath.c

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio) 
	mp_bh->bio = *bio;

	mp_bh->bio.bi_sector += multipath->rdev->data_offset;

	mp_bh->bio.bi_bdev = multipath->rdev->bdev;

	mp_bh->bio.bi_rw |= (1 << BIO_RW_FAILFAST);

	mp_bh->bio.bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT);

	mp_bh->bio.bi_end_io = multipath_end_request;

	mp_bh->bio.bi_private = mp_bh;

	generic_make_request(&mp_bh->bio);
@@ -393,7 +393,7 @@ static void multipathd (mddev_t *mddev) 
			*bio = *(mp_bh->master_bio);

			bio->bi_sector += conf->multipaths[mp_bh->path].rdev->data_offset;

			bio->bi_bdev = conf->multipaths[mp_bh->path].rdev->bdev;

			bio->bi_rw |= (1 << BIO_RW_FAILFAST);

			bio->bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT);

			bio->bi_end_io = multipath_end_request;

			bio->bi_private = mp_bh;

			generic_make_request(bio);

drivers/s390/block/dasd_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev, 
	}

	cqr->retries = DIAG_MAX_RETRIES;

	cqr->buildclk = get_clock();

	if (req->cmd_flags & REQ_FAILFAST)

	if (blk_noretry_request(req))

		set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);

	cqr->startdev = memdev;

	cqr->memdev = memdev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE