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 064/118] drbd: Moved code
    Date
    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    ---
    drivers/block/drbd/drbd_worker.c | 43 ++++++++++++++++++-------------------
    1 files changed, 21 insertions(+), 22 deletions(-)

    diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
    index 0dbd20c..28925d3 100644
    --- a/drivers/block/drbd/drbd_worker.c
    +++ b/drivers/block/drbd/drbd_worker.c
    @@ -707,28 +707,6 @@ static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int ca
    return 1;
    }

    -
    -void start_resync_timer_fn(unsigned long data)
    -{
    - struct drbd_conf *mdev = (struct drbd_conf *) data;
    -
    - drbd_queue_work(&mdev->tconn->data.work, &mdev->start_resync_work);
    -}
    -
    -int w_start_resync(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
    -{
    - if (atomic_read(&mdev->unacked_cnt) || atomic_read(&mdev->rs_pending_cnt)) {
    - dev_warn(DEV, "w_start_resync later...\n");
    - mdev->start_resync_timer.expires = jiffies + HZ/10;
    - add_timer(&mdev->start_resync_timer);
    - return 1;
    - }
    -
    - drbd_start_resync(mdev, C_SYNC_SOURCE);
    - clear_bit(AHEAD_TO_SYNC_SOURCE, &mdev->current_epoch->flags);
    - return 1;
    -}
    -
    int w_ov_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
    {
    kfree(w);
    @@ -1462,6 +1440,27 @@ void drbd_rs_controller_reset(struct drbd_conf *mdev)
    spin_unlock(&mdev->peer_seq_lock);
    }

    +void start_resync_timer_fn(unsigned long data)
    +{
    + struct drbd_conf *mdev = (struct drbd_conf *) data;
    +
    + drbd_queue_work(&mdev->tconn->data.work, &mdev->start_resync_work);
    +}
    +
    +int w_start_resync(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
    +{
    + if (atomic_read(&mdev->unacked_cnt) || atomic_read(&mdev->rs_pending_cnt)) {
    + dev_warn(DEV, "w_start_resync later...\n");
    + mdev->start_resync_timer.expires = jiffies + HZ/10;
    + add_timer(&mdev->start_resync_timer);
    + return 1;
    + }
    +
    + drbd_start_resync(mdev, C_SYNC_SOURCE);
    + clear_bit(AHEAD_TO_SYNC_SOURCE, &mdev->current_epoch->flags);
    + return 1;
    +}
    +
    /**
    * drbd_start_resync() - Start the resync process
    * @mdev: DRBD device.
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-08-25 17:27    [W:0.021 / U:28.996 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site