From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Wed, 13 Sep 2006 03:35:54 +0000 (-0700)
Subject: [PATCH] SCSI: lockdep annotation in scsi_send_eh_cmnd
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7fbb36451a91de6e8f9ece4f1f1ee9bd8ebf838a;p=openwrt%2Fstaging%2Fblogic.git

[PATCH] SCSI: lockdep annotation in scsi_send_eh_cmnd

Fixup for lockdep enabled kernels: Annotate an on-stack completion.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a8ed5a22009d..3d355d054612 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -466,7 +466,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
 	struct scsi_device *sdev = scmd->device;
 	struct Scsi_Host *shost = sdev->host;
 	int old_result = scmd->result;
-	DECLARE_COMPLETION(done);
+	DECLARE_COMPLETION_ONSTACK(done);
 	unsigned long timeleft;
 	unsigned long flags;
 	unsigned char old_cmnd[MAX_COMMAND_SIZE];