From a226fec7015869ca5f7ef09b6add4609d34ed08c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 23 May 2011 15:29:13 -0700
Subject: [PATCH] --- yaml --- r: 252457 b: refs/heads/master c:
 6e2037b0fd4d4ad9be941a3520d21945bc031a20 h: refs/heads/master i:   252455:
 ebea5144c0c8187dd4d10a1595d8af587ca54d5c v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/osst.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 29f513bdd176..b9056383b185 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a061f57d662ac2b19a1ff1955349adce7a282a5d
+refs/heads/master: 6e2037b0fd4d4ad9be941a3520d21945bc031a20
diff --git a/trunk/drivers/scsi/osst.c b/trunk/drivers/scsi/osst.c
index 9b79e84f95bb..de0b1a704fb5 100644
--- a/trunk/drivers/scsi/osst.c
+++ b/trunk/drivers/scsi/osst.c
@@ -4698,11 +4698,12 @@ static int __os_scsi_tape_open(struct inode * inode, struct file * filp)
 			break;
 
 			if ((SRpnt->sense[2] & 0x0f) == UNIT_ATTENTION) {
+				int j;
+
 				STp->pos_unknown = 0;
 				STp->partition = STp->new_partition = 0;
 				if (STp->can_partitions)
 					STp->nbr_partitions = 1;  /* This guess will be updated later if necessary */
-				int j;
 				for (j = 0; j < ST_NBR_PARTITIONS; j++) {
 					STps = &(STp->ps[j]);
 					STps->rw = ST_IDLE;