Merge remote-tracking branch 'scsi-core/core-for-3.16'

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sd.c
index 96af195224f2b9dae866ea109afb1d894c142c80,321faf6030359604c1d918d8154eefcb7291af47..e9689d57ccb6cb558925b63091ff3a95accdef28
--- 1/drivers/scsi/sd.c
--- 2/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;