diff options
| author | Philipp Reisner | 2012-04-06 12:13:18 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:58:27 +0100 |
| commit | 3ea35df83fe5e081c793a65361f912ec0835213b (patch) | |
| tree | 548815972aeee106445c5fd8934845a6c1d03642 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Ensure that data_size is not 0 before using data_size-1 as index (diff) | |
| download | kernel-qcow2-linux-3ea35df83fe5e081c793a65361f912ec0835213b.tar.gz kernel-qcow2-linux-3ea35df83fe5e081c793a65361f912ec0835213b.tar.xz kernel-qcow2-linux-3ea35df83fe5e081c793a65361f912ec0835213b.zip | |
drbd: fix spelling, remove boring development log message
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 349bd51773e5..7c67be0b7a01 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(); |