---

yaml --- r: 346189 b: refs/heads/master c: 3ea35df h: refs/heads/master i: 346187: 8805b64 v: v3
git-mirror · Nov 8, 2012 · 1e62763 · 1e62763
1 parent ea89ec9
commit 1e62763
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4bad1bcacd82b3d7727e30db26be3580bdc722a
+refs/heads/master: 3ea35df83fe5e081c793a65361f912ec0835213b
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/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();