diff --git a/[refs] b/[refs] index 368b6d7599b7..c33cfdb2e9f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0317d9ecbc9bac43642b4aa70e3e1106f4fd26a1 +refs/heads/master: f2257a56eeb4afb3daea894baf93077af0579586 diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index c27b428b9a5b..bae49bba1cc3 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/drivers/block/drbd/drbd_nl.c @@ -3034,8 +3034,7 @@ int drbd_adm_add_minor(struct sk_buff *skb, struct genl_info *info) if (retcode != NO_ERROR) goto out; - /* FIXME drop minor_count parameter, limit to MINORMASK */ - if (dh->minor >= minor_count) { + if (dh->minor > MINORMASK) { drbd_msg_put_info("requested minor out of range"); retcode = ERR_INVALID_REQUEST; goto out;