---

yaml --- r: 292959 b: refs/heads/master c: 0083208 h: refs/heads/master i: 292957: 5904052 292955: ed31fde 292951: c65b9cb 292943: fff6b43 292927: 5c2b26f v: v3
git-mirror · Feb 19, 2012 · 76be26c · 76be26c
1 parent d4e12c8
commit 76be26c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4042e9c84864a5666dc8ec14b3c1a5597b6a73f
+refs/heads/master: 0083208473d3d9a87dcdffaf36a2dbe718dfe282
diff --git a/trunk/drivers/scsi/libfc/fc_disc.c b/trunk/drivers/scsi/libfc/fc_disc.c
@@ -337,6 +337,13 @@ static void fc_disc_error(struct fc_disc *disc, struct fc_frame *fp)
 			schedule_delayed_work(&disc->disc_work, delay);
 		} else
 			fc_disc_done(disc, DISC_EV_FAILED);
+	} else if (PTR_ERR(fp) == -FC_EX_CLOSED) {
+		/*
+		 * if discovery fails due to lport reset, clear
+		 * pending flag so that subsequent discovery can
+		 * continue
+		 */
+		disc->pending = 0;
 	}
 }