[patch] reversed.patch

reversed.patch (text/plain), 1.14 KB, created by Tom Wijsman (TomWij) (RETIRED) on 2014-01-07 00:04:50 UTC

reverted:
--- b/drivers/block/aoe/aoe.h
+++ a/drivers/block/aoe/aoe.h
@@ -49,6 +49,8 @@
 	__be32 tag;
 };
 
+#define AOE_MAXSHELF (0xffff-1)	/* one less than the broadcast shelf address */
+
 struct aoe_atahdr {
 	unsigned char aflags;
 	unsigned char errfeat;
reverted:
--- b/drivers/block/aoe/aoecmd.c
+++ a/drivers/block/aoe/aoecmd.c
@@ -1349,14 +1349,15 @@
 			"Check shelf dip switches.\n");
 		return;
 	}
+	if (aoemajor > AOE_MAXSHELF) {
+		pr_info("aoe: e%ld.%d: shelf number too large\n",
-	if (aoemajor == 0xffff) {
-		pr_info("aoe: e%ld.%d: broadcast shelf number invalid\n",
 			aoemajor, (int) h->minor);
 		return;
 	}
+
+	d = aoedev_by_aoeaddr(aoemajor, h->minor, 1);
+	if (d == NULL) {
+		pr_info("aoe: device allocation failure\n");
-	if (h->minor == 0xff) {
-		pr_info("aoe: e%ld.%d: broadcast slot number invalid\n",
-			aoemajor, (int) h->minor);
 		return;
 	}
 
@@ -1364,12 +1365,6 @@
 	if (n > aoe_maxout)	/* keep it reasonable */
 		n = aoe_maxout;
 
-	d = aoedev_by_aoeaddr(aoemajor, h->minor, 1);
-	if (d == NULL) {
-		pr_info("aoe: device allocation failure\n");
-		return;
-	}
-
 	spin_lock_irqsave(&d->lock, flags);
 
 	t = gettgt(d, h->src);