]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drbd: fix spelling, remove boring development log message
authorPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 6 Apr 2012 10:13:18 +0000 (12:13 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:58:27 +0000 (16:58 +0100)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_receiver.c

index 349bd51773e5329eb077986f3149ac4dd3395bc3..7c67be0b7a0178430f6659ae614cbe5d8bcd021a 100644 (file)
@@ -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();