aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2012-10-01 18:04:12 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-09 14:11:42 +0100
commit4035e4c2ebeb6ac1acbf4e5dd8a759fcf93ff8da (patch)
tree6b05a01cb88deeec5a0e1159fd7d9db5067d3a09 /drivers
parent42839f65361baa0fa62494c32f1dae570e9dce19 (diff)
downloadvexpress-lsk-4035e4c2ebeb6ac1acbf4e5dd8a759fcf93ff8da.tar.gz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/drbd/drbd_nl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 52258867222..298dd3e35e0 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;