From: Mike Christie <michaelc@cs.wisc.edu>
Date: Fri, 27 Jan 2012 03:13:11 +0000 (-0600)
Subject: [SCSI] libiscsi: fix cmd timeout/completion race
X-Git-Tag: v3.4-rc1~145^2~133
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3d338a536330b5ffc9f28d7c6a4cdf6ba51867a;p=pandora-kernel.git

[SCSI] libiscsi: fix cmd timeout/completion race

If the driver/lib has called scsi_done and cleaned up internally but
scsi layer has not yet called blk_mark_rq_complete when the command
times out we hit a problem if the timeout code calls blk_mark_rq_complete first.
When the time out code calls into the driver we were returning
BLK_EH_RESET_TIMER and that causes the timeout code to just call
us again later.

We need to be calling BLK_EH_HANDLED so the timeout code can complete
the completion process because it had called blk_mark_rq_complete
on the command and now owns its processing.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

Reading git-diff-tree failed