From: Philipp Reisner Date: Fri, 6 Apr 2012 10:13:18 +0000 (+0200) Subject: drbd: fix spelling, remove boring development log message X-Git-Tag: upstream/snapshot3+hdmi~6035^2~18^2~85 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ea35df83fe5e081c793a65361f912ec0835213b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git drbd: fix spelling, remove boring development log message Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 349bd51..7c67be0 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1891,7 +1891,7 @@ static inline int overlaps(sector_t s1, int l1, sector_t s2, int l2) } /* maybe change sync_ee into interval trees as well? */ -static bool overlaping_resync_write(struct drbd_conf *mdev, struct drbd_peer_request *peer_req) +static bool overlapping_resync_write(struct drbd_conf *mdev, struct drbd_peer_request *peer_req) { struct drbd_peer_request *rs_req; bool rv = 0; @@ -1906,9 +1906,6 @@ static bool overlaping_resync_write(struct drbd_conf *mdev, struct drbd_peer_req } spin_unlock_irq(&mdev->tconn->req_lock); - if (rv) - dev_warn(DEV, "WARN: Avoiding concurrent data/resync write to single sector.\n"); - return rv; } @@ -2194,7 +2191,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi) spin_unlock_irq(&mdev->tconn->req_lock); if (mdev->state.conn == C_SYNC_TARGET) - wait_event(mdev->ee_wait, !overlaping_resync_write(mdev, peer_req)); + wait_event(mdev->ee_wait, !overlapping_resync_write(mdev, peer_req)); if (mdev->tconn->agreed_pro_version < 100) { rcu_read_lock();