From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Sep 2009 00:55:15 +0000 (-0700)
Subject: Merge branch 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=355bbd8cb82e60a592f6cd86ce6dbe5677615cf4;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block: (29 commits)
  block: use blkdev_issue_discard in blk_ioctl_discard
  Make DISCARD_BARRIER and DISCARD_NOBARRIER writes instead of reads
  block: don't assume device has a request list backing in nr_requests store
  block: Optimal I/O limit wrapper
  cfq: choose a new next_req when a request is dispatched
  Seperate read and write statistics of in_flight requests
  aoe: end barrier bios with EOPNOTSUPP
  block: trace bio queueing trial only when it occurs
  block: enable rq CPU completion affinity by default
  cfq: fix the log message after dispatched a request
  block: use printk_once
  cciss: memory leak in cciss_init_one()
  splice: update mtime and atime on files
  block: make blk_iopoll_prep_sched() follow normal 0/1 return convention
  cfq-iosched: get rid of must_alloc flag
  block: use interrupts disabled version of raise_softirq_irqoff()
  block: fix comment in blk-iopoll.c
  block: adjust default budget for blk-iopoll
  block: fix long lines in block/blk-iopoll.c
  block: add blk-iopoll, a NAPI like approach for block devices
  ...
---

355bbd8cb82e60a592f6cd86ce6dbe5677615cf4
diff --cc drivers/scsi/scsi_lib.c
index 662024d86949,90c94da8baa4..5987da857103
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -896,10 -896,11 +896,12 @@@ void scsi_io_completion(struct scsi_cmn
  			scsi_print_result(cmd);
  			if (driver_byte(result) & DRIVER_SENSE)
  				scsi_print_sense("", cmd);
 +			scsi_print_command(cmd);
  		}
- 		blk_end_request_all(req, -EIO);
- 		scsi_next_command(cmd);
+ 		if (blk_end_request_err(req, -EIO))
+ 			scsi_requeue_command(q, cmd);
+ 		else
+ 			scsi_next_command(cmd);
  		break;
  	case ACTION_REPREP:
  		/* Unprep the request and put it back at the head of the queue.