From b075f10f9b3a2b4943136715c7fcbda1e2a53f41 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Wed, 1 Aug 2012 12:46:20 +0200 Subject: [PATCH] --- yaml --- r: 346239 b: refs/heads/master c: eb12010e9af119c84e6b2214064a98681027e0e3 h: refs/heads/master i: 346237: d3c4bdc4d9af337b9913da9625c90a52594e1bad 346235: d2ba534f8748d6214744ca21afd48a00e0beafc4 346231: 264fc77bb455dc7b168d4153978ff38b5f0e9d32 346223: 00245d8c4cc1daebbc366c934f980efc8229fb6e 346207: 572805e08470cbf3e01aa4195388b7f120fb4d88 346175: d2abf8c7c50e561ffaa9b1e762c4a2e2b6177f6e 346111: d15aff18d8d0cc2de217a2b2cea0e1a38dcb9ec8 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_nl.c | 2 +- trunk/include/linux/drbd.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38344b01d5a0..6d348939272e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 427c0434fc52f15bd762ddc6611e874df6cc5b8d +refs/heads/master: eb12010e9af119c84e6b2214064a98681027e0e3 diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index 35bb572a2076..d1073705bf1f 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/drivers/block/drbd/drbd_nl.c @@ -1829,7 +1829,7 @@ _check_net_options(struct drbd_tconn *tconn, struct net_conf *old_conf, struct n return ERR_STONITH_AND_PROT_A; } if (mdev->state.role == R_PRIMARY && new_conf->discard_my_data) - return ERR_DISCARD; + return ERR_DISCARD_IMPOSSIBLE; } if (new_conf->on_congestion != OC_BLOCK && new_conf->wire_protocol != DRBD_PROT_A) diff --git a/trunk/include/linux/drbd.h b/trunk/include/linux/drbd.h index 5171c3530886..0b93e5e2e064 100644 --- a/trunk/include/linux/drbd.h +++ b/trunk/include/linux/drbd.h @@ -136,7 +136,7 @@ enum drbd_ret_code { ERR_AUTH_ALG = 120, ERR_AUTH_ALG_ND = 121, ERR_NOMEM = 122, - ERR_DISCARD = 123, + ERR_DISCARD_IMPOSSIBLE = 123, ERR_DISK_CONFIGURED = 124, ERR_NET_CONFIGURED = 125, ERR_MANDATORY_TAG = 126,