Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196883
b: refs/heads/master
c: 4e23a59
h: refs/heads/master
i:
  196881: d5f8c4d
  196879: c9e0113
v: v3
  • Loading branch information
Philipp Reisner authored and Jens Axboe committed May 21, 2010
1 parent 951fd0b commit b88baab
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23ce422748def9652fdc019f740cd7900fa2fe3b
refs/heads/master: 4e23a59ed1c5f12e14f7899855f8379b3d42e578
2 changes: 0 additions & 2 deletions trunk/drivers/block/drbd/drbd_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1213,8 +1213,6 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
&& (ns.pdsk < D_INCONSISTENT ||
ns.pdsk == D_UNKNOWN ||
ns.pdsk == D_OUTDATED)) {
kfree(mdev->p_uuid);
mdev->p_uuid = NULL;
if (get_ldev(mdev)) {
if ((ns.role == R_PRIMARY || ns.peer == R_PRIMARY) &&
mdev->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE &&
Expand Down

0 comments on commit b88baab

Please sign in to comment.