From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Aug 2008 15:42:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
X-Git-Tag: v2.6.27-rc4~33
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5b0079c0a7641caac3fedab75e8e63aeb54d7e2;hp=-c;p=linux-2.6

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (22 commits)
  [SCSI] ibmvfc: Driver version 1.0.2
  [SCSI] ibmvfc: Add details to async event log
  [SCSI] ibmvfc: Sanitize response lengths
  [SCSI] ibmvfc: Fix for lost async events
  [SCSI] ibmvfc: Fixup host state during reinit
  [SCSI] ibmvfc: Fix another hang on module removal
  [SCSI] ibmvscsi: Fixup desired DMA value for shared memory partitions
  [SCSI] megaraid_sas: remove sysfs dbg_lvl world writeable permissions
  [SCSI] qla2xxx: Update version number to 8.02.01-k7.
  [SCSI] qla2xxx: Explicitly tear-down vports during PCI remove_one().
  [SCSI] qla2xxx: Reference proper ha during SBR handling.
  [SCSI] qla2xxx: Set npiv_supported flag for FCoE HBAs.
  [SCSI] qla2xxx: Don't leak SG-DMA mappings while aborting commands.
  [SCSI] qla2xxx: Correct vport-state management issues during ISP-ABORT.
  [SCSI] qla2xxx: Correct synchronization of software/firmware fcport states.
  [SCSI] scsi_dh: Initialize lun_state in check_ownership()
  [SCSI] scsi_dh: Do not use scsilun in rdac hardware handler
  [SCSI] megaraid_sas: version and Documentation Update
  [SCSI] megaraid_sas: add new controllers (0x78 0x79)
  [SCSI] megaraid_sas: add the shutdown DCMD cmd to driver shutdown routine
  ...
---

c5b0079c0a7641caac3fedab75e8e63aeb54d7e2
diff --combined drivers/scsi/device_handler/scsi_dh_rdac.c
index e7c7b4ebc1,518da832ad..2dee69da35
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@@ -376,7 -376,7 +376,7 @@@ static int get_lun(struct scsi_device *
  		if (inqp->page_id[0] != 'e' || inqp->page_id[1] != 'd' ||
  		    inqp->page_id[2] != 'i' || inqp->page_id[3] != 'd')
  			return SCSI_DH_NOSYS;
- 		h->lun = scsilun_to_int((struct scsi_lun *)inqp->lun);
+ 		h->lun = inqp->lun[7]; /* Uses only the last byte */
  	}
  	return err;
  }
@@@ -386,6 -386,7 +386,7 @@@ static int check_ownership(struct scsi_
  	int err;
  	struct c9_inquiry *inqp;
  
+ 	h->lun_state = RDAC_LUN_UNOWNED;
  	err = submit_inquiry(sdev, 0xC9, sizeof(struct c9_inquiry), h);
  	if (err == SCSI_DH_OK) {
  		inqp = &h->inq.c9;
@@@ -574,7 -575,7 +575,7 @@@ static int rdac_check_sense(struct scsi
  	return SCSI_RETURN_NOT_HANDLED;
  }
  
 -const struct scsi_dh_devlist rdac_dev_list[] = {
 +static const struct scsi_dh_devlist rdac_dev_list[] = {
  	{"IBM", "1722"},
  	{"IBM", "1724"},
  	{"IBM", "1726"},