drbd: Make the peer_seq updating code more obvious
authorAndreas Gruenbacher <agruen@linbit.com>
Thu, 3 Feb 2011 17:42:08 +0000 (18:42 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Wed, 28 Sep 2011 08:26:35 +0000 (10:26 +0200)
Make it more clear that update_peer_seq() is supposed to wake up the
seq_wait queue whenever the sequence number changes.

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 b063ca234462b474c19644c97a355e45d44dd8f5..bc5351df8073e0c03894bbf71b4d45a22d93e804 100644 (file)
@@ -1650,15 +1650,15 @@ static u32 seq_max(u32 a, u32 b)
        return seq_greater(a, b) ? a : b;
 }
 
-static void update_peer_seq(struct drbd_conf *mdev, unsigned int new_seq)
+static void update_peer_seq(struct drbd_conf *mdev, unsigned int peer_seq)
 {
-       unsigned int m;
+       unsigned int old_peer_seq;
 
        spin_lock(&mdev->peer_seq_lock);
-       m = seq_max(mdev->peer_seq, new_seq);
-       mdev->peer_seq = m;
+       old_peer_seq = mdev->peer_seq;
+       mdev->peer_seq = seq_max(mdev->peer_seq, peer_seq);
        spin_unlock(&mdev->peer_seq_lock);
-       if (m == new_seq)
+       if (old_peer_seq != peer_seq)
                wake_up(&mdev->seq_wait);
 }