Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 213105
b: refs/heads/master
c: 1616a25
h: refs/heads/master
i:
  213103: e5f5fe5
v: v3
  • Loading branch information
Philipp Reisner committed Oct 14, 2010
1 parent f85e036 commit c004725
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 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: 999122bc188a4d0a4847bdf1915d357bd6ab53dc
refs/heads/master: 1616a25493cce727d582886f162c5bb0abd87e6a
8 changes: 1 addition & 7 deletions trunk/drivers/block/drbd/drbd_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -997,14 +997,8 @@ int __drbd_set_state(struct drbd_conf *mdev,
/* If the old state was illegal as well, then let
this happen...*/

if (is_valid_state(mdev, os) == rv) {
dev_err(DEV, "Considering state change from bad state. "
"Error would be: '%s'\n",
drbd_set_st_err_str(rv));
print_st(mdev, "old", os);
print_st(mdev, "new", ns);
if (is_valid_state(mdev, os) == rv)
rv = is_valid_state_transition(mdev, ns, os);
}
} else
rv = is_valid_state_transition(mdev, ns, os);
}
Expand Down

0 comments on commit c004725

Please sign in to comment.