From 4bb22b33214b211fe4b6ccf37d3a8fc0bd559e6f Mon Sep 17 00:00:00 2001
From: "Rajashekhara, Mahesh" <Mahesh_Rajashekhara@adaptec.com>
Date: Mon, 10 May 2010 04:05:50 -0700
Subject: [PATCH] --- yaml --- r: 195715 b: refs/heads/master c:
 5ca05594097438f81337e53ad50c2d17ffc28238 h: refs/heads/master i:   195713:
 26feeae4fed3af301c1a0d553ea1b9a8e69ddc6b   195711:
 ddded08b9eca133283af45ed4d9ebaaa9d8152cb v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/scsi/aacraid/aacraid.h |  2 +-
 trunk/drivers/scsi/aacraid/commsup.c | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b42ae6c2bbb8..9d5c9f0bfbd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15af974dcb22914f29aeb9a9cac5879b0dc3860e
+refs/heads/master: 5ca05594097438f81337e53ad50c2d17ffc28238
diff --git a/trunk/drivers/scsi/aacraid/aacraid.h b/trunk/drivers/scsi/aacraid/aacraid.h
index 619c02d9c862..9f985267c30f 100644
--- a/trunk/drivers/scsi/aacraid/aacraid.h
+++ b/trunk/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
  *----------------------------------------------------------------------------*/
 
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 24702
+# define AAC_DRIVER_BUILD 26000
 # define AAC_DRIVER_BRANCH "-ms"
 #endif
 #define MAXIMUM_NUM_CONTAINERS	32
diff --git a/trunk/drivers/scsi/aacraid/commsup.c b/trunk/drivers/scsi/aacraid/commsup.c
index 94d2954d79ae..69692b050e3c 100644
--- a/trunk/drivers/scsi/aacraid/commsup.c
+++ b/trunk/drivers/scsi/aacraid/commsup.c
@@ -966,6 +966,16 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
 			device_config_needed =
 			  (((__le32 *)aifcmd->data)[0] ==
 			    cpu_to_le32(AifEnAddJBOD)) ? ADD : DELETE;
+			if (device_config_needed == ADD) {
+				device = scsi_device_lookup(dev->scsi_host_ptr,
+					channel,
+					id,
+					lun);
+				if (device) {
+					scsi_remove_device(device);
+					scsi_device_put(device);
+				}
+			}
 			break;
 
 		case AifEnEnclosureManagement: