From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Mon, 1 Oct 2012 16:04:12 +0000 (+0200)
Subject: drbd: Fix clearing of MDF_AL_DISABLED
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4035e4c2ebeb6ac1acbf4e5dd8a759fcf93ff8da;p=linux-beck.git

drbd: Fix clearing of MDF_AL_DISABLED

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 52258867222a..298dd3e35e02 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/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;