diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2012-04-06 06:13:18 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:58:27 -0500 |
commit | 3ea35df83fe5e081c793a65361f912ec0835213b (patch) | |
tree | 548815972aeee106445c5fd8934845a6c1d03642 /drivers/block/drbd | |
parent | e4bad1bcacd82b3d7727e30db26be3580bdc722a (diff) |
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')
-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) | |||
1891 | } | 1891 | } |
1892 | 1892 | ||
1893 | /* maybe change sync_ee into interval trees as well? */ | 1893 | /* maybe change sync_ee into interval trees as well? */ |
1894 | static bool overlaping_resync_write(struct drbd_conf *mdev, struct drbd_peer_request *peer_req) | 1894 | static bool overlapping_resync_write(struct drbd_conf *mdev, struct drbd_peer_request *peer_req) |
1895 | { | 1895 | { |
1896 | struct drbd_peer_request *rs_req; | 1896 | struct drbd_peer_request *rs_req; |
1897 | bool rv = 0; | 1897 | bool rv = 0; |
@@ -1906,9 +1906,6 @@ static bool overlaping_resync_write(struct drbd_conf *mdev, struct drbd_peer_req | |||
1906 | } | 1906 | } |
1907 | spin_unlock_irq(&mdev->tconn->req_lock); | 1907 | spin_unlock_irq(&mdev->tconn->req_lock); |
1908 | 1908 | ||
1909 | if (rv) | ||
1910 | dev_warn(DEV, "WARN: Avoiding concurrent data/resync write to single sector.\n"); | ||
1911 | |||
1912 | return rv; | 1909 | return rv; |
1913 | } | 1910 | } |
1914 | 1911 | ||
@@ -2194,7 +2191,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi) | |||
2194 | spin_unlock_irq(&mdev->tconn->req_lock); | 2191 | spin_unlock_irq(&mdev->tconn->req_lock); |
2195 | 2192 | ||
2196 | if (mdev->state.conn == C_SYNC_TARGET) | 2193 | if (mdev->state.conn == C_SYNC_TARGET) |
2197 | wait_event(mdev->ee_wait, !overlaping_resync_write(mdev, peer_req)); | 2194 | wait_event(mdev->ee_wait, !overlapping_resync_write(mdev, peer_req)); |
2198 | 2195 | ||
2199 | if (mdev->tconn->agreed_pro_version < 100) { | 2196 | if (mdev->tconn->agreed_pro_version < 100) { |
2200 | rcu_read_lock(); | 2197 | rcu_read_lock(); |