From 01ccbfd0e513a2aaf33c13bf36d5892b6c1c6dc3 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Sat, 18 Dec 2010 13:36:54 +0100 Subject: [PATCH] --- yaml --- r: 242877 b: refs/heads/master c: 418e0a927d520f9c8e875ea75abee35d93a0f1b3 h: refs/heads/master i: 242875: 336b13f5787c3e9dbd52e747f07cd9a3f4eb8a81 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9af0b81ab138..43304b4287cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7648cdfe52daf0ca4fa9489879dea9e089b0dfe1 +refs/heads/master: 418e0a927d520f9c8e875ea75abee35d93a0f1b3 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 2190064d59bd..f529c25e1ad5 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -1351,7 +1351,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, if (ns.conn == C_CONNECTED) what = resend, nsm.susp_nod = 0; else /* ns.conn > C_CONNECTED */ - dev_err(DEV, "Unexpected Resynd going on!\n"); + dev_err(DEV, "Unexpected Resync going on!\n"); } if (os.disk == D_ATTACHING && ns.disk > D_ATTACHING)