Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 346271
b: refs/heads/master
c: 4035e4c
h: refs/heads/master
i:
  346269: f558870
  346267: 6129121
  346263: a872d60
  346255: 113e3df
  346239: b075f10
v: v3
  • Loading branch information
Philipp Reisner committed Nov 9, 2012
1 parent 370032f commit 7ef295a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 42839f65361baa0fa62494c32f1dae570e9dce19
refs/heads/master: 4035e4c2ebeb6ac1acbf4e5dd8a759fcf93ff8da
4 changes: 2 additions & 2 deletions trunk/drivers/block/drbd/drbd_nl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 7ef295a

Please sign in to comment.