From 70fc08ba179271235f78b9b4f6544793d342739e Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Mon, 14 Mar 2011 13:58:03 +0100 Subject: [PATCH] --- yaml --- r: 345864 b: refs/heads/master c: 527f4b24e51194a79f89ce5ce523236be31c511d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_nl.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 1213e2982d76..1b101099eee5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38f19616d2c6d4e0ab2de01e4c2f159cd5aa8b49 +refs/heads/master: 527f4b24e51194a79f89ce5ce523236be31c511d diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index 0d3753be371c..f965dfe4b5ff 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/drivers/block/drbd/drbd_nl.c @@ -204,20 +204,20 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info, } /* some more paranoia, if the request was over-determined */ + if (adm_ctx.mdev && adm_ctx.tconn && + adm_ctx.mdev->tconn != adm_ctx.tconn) { + pr_warning("request: minor=%u, conn=%s; but that minor belongs to connection %s\n", + adm_ctx.minor, adm_ctx.conn_name, adm_ctx.mdev->tconn->name); + drbd_msg_put_info("minor exists in different connection"); + return ERR_INVALID_REQUEST; + } if (adm_ctx.mdev && adm_ctx.volume != VOLUME_UNSPECIFIED && adm_ctx.volume != adm_ctx.mdev->vnr) { pr_warning("request: minor=%u, volume=%u; but that minor is volume %u in %s\n", adm_ctx.minor, adm_ctx.volume, adm_ctx.mdev->vnr, adm_ctx.mdev->tconn->name); - drbd_msg_put_info("over-determined configuration context mismatch"); - return ERR_INVALID_REQUEST; - } - if (adm_ctx.mdev && adm_ctx.tconn && - adm_ctx.mdev->tconn != adm_ctx.tconn) { - pr_warning("request: minor=%u, conn=%s; but that minor belongs to connection %s\n", - adm_ctx.minor, adm_ctx.conn_name, adm_ctx.mdev->tconn->name); - drbd_msg_put_info("over-determined configuration context mismatch"); + drbd_msg_put_info("minor exists as different volume"); return ERR_INVALID_REQUEST; } if (adm_ctx.mdev && !adm_ctx.tconn)