dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

drbd: cosmetic, don't report resync for online-verify

Browse source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Lars Ellenberg 2010-09-06 12:13:20 +02:00 committed by Philipp Reisner
parent a821cc4a9a
commit 02bc7174ae
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/block/drbd/drbd_main.c
View file

@ -504,7 +504,7 @@ static int is_valid_state(struct drbd_conf *mdev, union drbd_state ns);
static int is_valid_state_transition(struct drbd_conf *, static int is_valid_state_transition(struct drbd_conf *,
union drbd_state, union drbd_state); union drbd_state, union drbd_state);
static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state os, static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state os,
union drbd_state ns, int *warn_sync_abort); union drbd_state ns, const char **warn_sync_abort);
int drbd_send_state_req(struct drbd_conf *, int drbd_send_state_req(struct drbd_conf *,
union drbd_state, union drbd_state); union drbd_state, union drbd_state);
@ -812,7 +812,7 @@ static int is_valid_state_transition(struct drbd_conf *mdev,
* to D_UNKNOWN. This rule and many more along those lines are in this function. * to D_UNKNOWN. This rule and many more along those lines are in this function.
*/ */
static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state os, static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state os,
union drbd_state ns, int *warn_sync_abort) union drbd_state ns, const char **warn_sync_abort)
{ {
enum drbd_fencing_p fp; enum drbd_fencing_p fp;
@ -851,7 +851,9 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state
if (os.conn > C_CONNECTED && ns.conn > C_CONNECTED && if (os.conn > C_CONNECTED && ns.conn > C_CONNECTED &&
(ns.disk <= D_FAILED || ns.pdsk <= D_FAILED)) { (ns.disk <= D_FAILED || ns.pdsk <= D_FAILED)) {
if (warn_sync_abort) if (warn_sync_abort)
*warn_sync_abort = 1; *warn_sync_abort =
os.conn == C_VERIFY_S || os.conn == C_VERIFY_T ?
"Online-verify" : "Resync";
ns.conn = C_CONNECTED; ns.conn = C_CONNECTED;
} }
@ -984,7 +986,7 @@ int __drbd_set_state(struct drbd_conf *mdev,
{ {
union drbd_state os; union drbd_state os;
int rv = SS_SUCCESS; int rv = SS_SUCCESS;
int warn_sync_abort = 0; const char *warn_sync_abort = NULL;
struct after_state_chg_work *ascw; struct after_state_chg_work *ascw;
os = mdev->state; os = mdev->state;
@ -1016,7 +1018,7 @@ int __drbd_set_state(struct drbd_conf *mdev,
} }
if (warn_sync_abort) if (warn_sync_abort)
dev_warn(DEV, "Resync aborted.\n"); dev_warn(DEV, "%s aborted.\n", warn_sync_abort);
{ {
char *pbp, pb[300]; char *pbp, pb[300];