summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher2011-02-03 18:42:08 +0100
committerPhilipp Reisner2011-09-28 10:26:35 +0200
commit43ae077d0a1e98dd13112646fe967565febf4fe7 (patch)
tree1d37ba0f413c7a766415609290474bd365b26679 /drivers/block/drbd/drbd_receiver.c
parentdrbd: Defer new writes when detecting conflicting writes (diff)
downloadkernel-qcow2-linux-43ae077d0a1e98dd13112646fe967565febf4fe7.tar.gz
kernel-qcow2-linux-43ae077d0a1e98dd13112646fe967565febf4fe7.tar.xz
kernel-qcow2-linux-43ae077d0a1e98dd13112646fe967565febf4fe7.zip
drbd: Make the peer_seq updating code more obvious
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>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r--drivers/block/drbd/drbd_receiver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index b063ca234462..bc5351df8073 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -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);
}