lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 054/118] drbd: Make the peer_seq updating code more obvious
    Date
    From: Andreas Gruenbacher <agruen@linbit.com>

    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 | 10 +++++-----
    1 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
    index cde48f3..654c1c9 100644
    --- a/drivers/block/drbd/drbd_receiver.c
    +++ b/drivers/block/drbd/drbd_receiver.c
    @@ -1654,15 +1654,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);
    }

    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-08-25 17:29    [W:4.154 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site