diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 14:44:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 14:44:23 +1000 |
| commit | 69146ae8774832d62c0b633a9a42b1711c410f7a (patch) | |
| tree | 50a85e86085015325e3180e7ecdc3e38f68f337f | |
| parent | 8cd6e4d5f83ff0e34e316b3221e9e899643b6920 (diff) | |
| parent | c3643395dc3b8d47932e2bbc2992532ae88ee522 (diff) | |
Merge branch 'quilt/aoe'
| -rw-r--r-- | drivers/block/aoe/aoecmd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c index 5674bd01d96d..b1e5c624b110 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c @@ -987,8 +987,12 @@ aoecmd_cfg_rsp(struct sk_buff *skb) } sysminor = SYSMINOR(aoemajor, h->minor); - if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) { - printk(KERN_INFO "aoe: e%ld.%d: minor number too large\n", + if (h->minor >= NPERSHELF) { + printk(KERN_INFO "aoe: e%ld.%d: AoE minor address too large\n", + aoemajor, (int) h->minor); + return; + } else if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) { + printk(KERN_INFO "aoe: e%ld.%d: AoE major address too large\n", aoemajor, (int) h->minor); return; } |