diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 13:59:41 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 13:59:41 +1100 |
commit | f6ad3c2fb4b4ae07b121f49d87d729474ec7467b (patch) | |
tree | 432d413dc99582880f819909a79bbcfde4e04fe1 /drivers/block | |
parent | 40dd45536eb581c525f58536548eca4136eddd78 (diff) | |
parent | c3643395dc3b8d47932e2bbc2992532ae88ee522 (diff) |
Merge branch 'quilt/aoe'
Diffstat (limited to 'drivers/block')
-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 64a223b0cc22..eabc01a25813 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c @@ -986,8 +986,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; } |