From 7ef295af71a5264f85bbaf434641e73a081c5b84 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 1 Oct 2012 18:04:12 +0200 Subject: [PATCH] --- yaml --- r: 346271 b: refs/heads/master c: 4035e4c2ebeb6ac1acbf4e5dd8a759fcf93ff8da h: refs/heads/master i: 346269: f558870ff7ba6edb8e43c1a2d6fe0f871ac620a6 346267: 6129121c1e48327913a2b1217b85e60d20fb2bb8 346263: a872d60453a2cda7e2f01650707507e79a0ef954 346255: 113e3df546b60a16fa723be108984f1c1f811cc5 346239: b075f10f9b3a2b4943136715c7fcbda1e2a53f41 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_nl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4e68850ac199..c439ef3f4be4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42839f65361baa0fa62494c32f1dae570e9dce19 +refs/heads/master: 4035e4c2ebeb6ac1acbf4e5dd8a759fcf93ff8da diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index 52258867222a..298dd3e35e02 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/drivers/block/drbd/drbd_nl.c @@ -1226,7 +1226,7 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info) mutex_unlock(&mdev->tconn->conf_update); if (new_disk_conf->al_updates) - mdev->ldev->md.flags &= MDF_AL_DISABLED; + mdev->ldev->md.flags &= ~MDF_AL_DISABLED; else mdev->ldev->md.flags |= MDF_AL_DISABLED; @@ -1615,7 +1615,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) flags. */ if (rcu_dereference(mdev->ldev->disk_conf)->al_updates) - mdev->ldev->md.flags &= MDF_AL_DISABLED; + mdev->ldev->md.flags &= ~MDF_AL_DISABLED; else mdev->ldev->md.flags |= MDF_AL_DISABLED;