From: K. Y. Srinivasan <kys@microsoft.com>
Date: Sat, 27 Aug 2011 18:31:29 +0000 (-0700)
Subject: Staging: hv: storvsc: No need to copy from bounce buffer in case of a failure
X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~833
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70691ec666a6c04f6f1438d9a0bf495b24e22610;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: hv: storvsc: No need to copy from bounce buffer in case of a failure

No need to copy from bounce buffer in case of a failure; cleanup the code
accordingly.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 22a1d758620e..d575bc92ffc4 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -1315,17 +1315,9 @@ retry_request:
 	if (ret == -EAGAIN) {
 		/* no more space */
 
-		if (cmd_request->bounce_sgl_count) {
-			/*
-			 * FIXME: We can optimize on writes by just skipping
-			 * this
-			 */
-			copy_from_bounce_buffer(scsi_sglist(scmnd),
-						cmd_request->bounce_sgl,
-						scsi_sg_count(scmnd));
+		if (cmd_request->bounce_sgl_count)
 			destroy_bounce_buffer(cmd_request->bounce_sgl,
-					      cmd_request->bounce_sgl_count);
-		}
+					cmd_request->bounce_sgl_count);
 
 		kmem_cache_free(host_dev->request_pool, cmd_request);