From: Andrew Morton <akpm@osdl.org>

Jens has been changing things.  Whoever merges second will need this.

How come scsi_tgt_cmd_destroy() uses a hard-coded "1" for ->cmd_flags??

Cc: Jens Axboe <axboe@suse.de>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/scsi/scsi_tgt_lib.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/scsi/scsi_tgt_lib.c~git-scsi-target-vs-git-block drivers/scsi/scsi_tgt_lib.c
--- a/drivers/scsi/scsi_tgt_lib.c~git-scsi-target-vs-git-block
+++ a/drivers/scsi/scsi_tgt_lib.c
@@ -107,7 +107,8 @@ struct scsi_cmnd *scsi_host_get_command(
 	cmd->request = rq;
 
 	rq->special = cmd;
-	rq->flags |= REQ_SPECIAL | REQ_BLOCK_PC;
+	rq->cmd_type = REQ_TYPE_SPECIAL;
+	rq->cmd_flags |= REQ_TYPE_BLOCK_PC;
 	rq->end_io_data = tcmd;
 
 	bio_list_init(&tcmd->xfer_list);
_