From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Jun 2014 01:54:06 +0000 (-0700)
Subject: Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb... 
X-Git-Tag: v3.16-rc1~66
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1c54fc1efe6922b4e7ffd591739d72050976ccd6;p=karo-tx-linux.git

Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This patch consists of the usual driver updates (qla2xxx, qla4xxx,
  lpfc, be2iscsi, fnic, ufs, NCR5380) The NCR5380 is the addition to
  maintained status of a long neglected driver for older hardware.  In
  addition there are a lot of minor fixes and cleanups and some more
  updates to make scsi mq ready"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (130 commits)
  include/scsi/osd_protocol.h: remove unnecessary __constant
  mvsas: Recognise device/subsystem 9485/9485 as 88SE9485
  Revert "be2iscsi: Fix processing cqe for cxn whose endpoint is freed"
  mptfusion: fix msgContext in mptctl_hp_hostinfo
  acornscsi: remove linked command support
  scsi/NCR5380: dprintk macro
  fusion: Remove use of DEF_SCSI_QCMD
  fusion: Add free msg frames to the head, not tail of list
  mpt2sas: Add free smids to the head, not tail of list
  mpt2sas: Remove use of DEF_SCSI_QCMD
  mpt2sas: Remove uses of serial_number
  mpt3sas: Remove use of DEF_SCSI_QCMD
  mpt3sas: Remove uses of serial_number
  qla2xxx: Use kmemdup instead of kmalloc + memcpy
  qla4xxx: Use kmemdup instead of kmalloc + memcpy
  qla2xxx: fix incorrect debug printk
  be2iscsi: Bump the driver version
  be2iscsi: Fix processing cqe for cxn whose endpoint is freed
  be2iscsi: Fix destroy MCC-CQ before MCC-EQ is destroyed
  be2iscsi: Fix memory corruption in MBX path
  ...
---

1c54fc1efe6922b4e7ffd591739d72050976ccd6
diff --cc drivers/scsi/sd.c
index 96af195224f2,321faf603035..e9689d57ccb6
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -836,13 -842,14 +840,13 @@@ static int scsi_setup_flush_cmnd(struc
  	return scsi_setup_blk_pc_cmnd(sdp, rq);
  }
  
- static void sd_unprep_fn(struct request_queue *q, struct request *rq)
+ static void sd_uninit_command(struct scsi_cmnd *SCpnt)
  {
- 	struct scsi_cmnd *SCpnt = rq->special;
+ 	struct request *rq = SCpnt->request;
  
 -	if (rq->cmd_flags & REQ_DISCARD) {
 -		free_page((unsigned long)rq->buffer);
 -		rq->buffer = NULL;
 -	}
 +	if (rq->cmd_flags & REQ_DISCARD)
 +		__free_page(rq->completion_data);
 +
  	if (SCpnt->cmnd != rq->cmd) {
  		mempool_free(SCpnt->cmnd, sd_cdb_pool);
  		SCpnt->cmnd = NULL;