Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 00d56944 编写于 作者: P Philipp Reisner
浏览文件
操作

drbd: Generalized the work callbacks 

No longer work callbacks must operate on a mdev. From now on they
can also operate on a tconn.
Signed-off-by: NPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: NLars Ellenberg <lars.ellenberg@linbit.com>
上级 6699b655
隐藏空白更改
内联 并排
Showing with 100 addition and 70 deletion
drivers/block/drbd/drbd_actlog.c
浏览文件 @ 00d56944
...@@ -63,7 +63,7 @@ struct drbd_atodb_wait { ...@@ -63,7 +63,7 @@ struct drbd_atodb_wait {
}; };
int w_al_write_transaction(struct drbd_conf *, struct drbd_work *, int); int w_al_write_transaction(struct drbd_work *, int);
static int _drbd_md_sync_page_io(struct drbd_conf *mdev, static int _drbd_md_sync_page_io(struct drbd_conf *mdev,
struct drbd_backing_dev *bdev, struct drbd_backing_dev *bdev,
...@@ -291,9 +291,10 @@ static unsigned int rs_extent_to_bm_page(unsigned int rs_enr) ...@@ -291,9 +291,10 @@ static unsigned int rs_extent_to_bm_page(unsigned int rs_enr)
} }
int int
w_al_write_transaction(struct drbd_conf *mdev, struct drbd_work *w, int unused) w_al_write_transaction(struct drbd_work *w, int unused)
{ {
struct update_al_work *aw = container_of(w, struct update_al_work, w); struct update_al_work *aw = container_of(w, struct update_al_work, w);
struct drbd_conf *mdev = w->mdev;
struct lc_element *updated = aw->al_ext; struct lc_element *updated = aw->al_ext;
const unsigned int new_enr = aw->enr; const unsigned int new_enr = aw->enr;
const unsigned int evicted = aw->old_enr; const unsigned int evicted = aw->old_enr;
...@@ -612,9 +613,10 @@ void drbd_al_shrink(struct drbd_conf *mdev) ...@@ -612,9 +613,10 @@ void drbd_al_shrink(struct drbd_conf *mdev)
wake_up(&mdev->al_wait); wake_up(&mdev->al_wait);
} }
static int w_update_odbm(struct drbd_conf *mdev, struct drbd_work *w, int unused) static int w_update_odbm(struct drbd_work *w, int unused)
{ {
struct update_odbm_work *udw = container_of(w, struct update_odbm_work, w); struct update_odbm_work *udw = container_of(w, struct update_odbm_work, w);
struct drbd_conf *mdev = w->mdev;
if (!get_ldev(mdev)) { if (!get_ldev(mdev)) {
if (__ratelimit(&drbd_ratelimit_state)) if (__ratelimit(&drbd_ratelimit_state))
......
drivers/block/drbd/drbd_int.h
浏览文件 @ 00d56944
...@@ -641,11 +641,14 @@ static inline enum drbd_thread_state get_t_state(struct drbd_thread *thi) ...@@ -641,11 +641,14 @@ static inline enum drbd_thread_state get_t_state(struct drbd_thread *thi)
} }
struct drbd_work; struct drbd_work;
typedef int (*drbd_work_cb)(struct drbd_conf *, struct drbd_work *, int cancel); typedef int (*drbd_work_cb)(struct drbd_work *, int cancel);
struct drbd_work { struct drbd_work {
struct list_head list; struct list_head list;
drbd_work_cb cb; drbd_work_cb cb;
struct drbd_conf *mdev; union {
struct drbd_conf *mdev;
struct drbd_tconn *tconn;
};
}; };
#include "drbd_interval.h" #include "drbd_interval.h"
...@@ -1495,25 +1498,25 @@ extern void drbd_csum_bio(struct drbd_conf *, struct crypto_hash *, struct bio * ...@@ -1495,25 +1498,25 @@ extern void drbd_csum_bio(struct drbd_conf *, struct crypto_hash *, struct bio *
extern void drbd_csum_ee(struct drbd_conf *, struct crypto_hash *, extern void drbd_csum_ee(struct drbd_conf *, struct crypto_hash *,
struct drbd_peer_request *, void *); struct drbd_peer_request *, void *);
/* worker callbacks */ /* worker callbacks */
extern int w_req_cancel_conflict(struct drbd_conf *, struct drbd_work *, int); extern int w_req_cancel_conflict(struct drbd_work *, int);
extern int w_read_retry_remote(struct drbd_conf *, struct drbd_work *, int); extern int w_read_retry_remote(struct drbd_work *, int);
extern int w_e_end_data_req(struct drbd_conf *, struct drbd_work *, int); extern int w_e_end_data_req(struct drbd_work *, int);
extern int w_e_end_rsdata_req(struct drbd_conf *, struct drbd_work *, int); extern int w_e_end_rsdata_req(struct drbd_work *, int);
extern int w_e_end_csum_rs_req(struct drbd_conf *, struct drbd_work *, int); extern int w_e_end_csum_rs_req(struct drbd_work *, int);
extern int w_e_end_ov_reply(struct drbd_conf *, struct drbd_work *, int); extern int w_e_end_ov_reply(struct drbd_work *, int);
extern int w_e_end_ov_req(struct drbd_conf *, struct drbd_work *, int); extern int w_e_end_ov_req(struct drbd_work *, int);
extern int w_ov_finished(struct drbd_conf *, struct drbd_work *, int); extern int w_ov_finished(struct drbd_work *, int);
extern int w_resync_timer(struct drbd_conf *, struct drbd_work *, int); extern int w_resync_timer(struct drbd_work *, int);
extern int w_resume_next_sg(struct drbd_conf *, struct drbd_work *, int); extern int w_resume_next_sg(struct drbd_work *, int);
extern int w_send_write_hint(struct drbd_conf *, struct drbd_work *, int); extern int w_send_write_hint(struct drbd_work *, int);
extern int w_send_dblock(struct drbd_conf *, struct drbd_work *, int); extern int w_send_dblock(struct drbd_work *, int);
extern int w_send_barrier(struct drbd_conf *, struct drbd_work *, int); extern int w_send_barrier(struct drbd_work *, int);
extern int w_send_read_req(struct drbd_conf *, struct drbd_work *, int); extern int w_send_read_req(struct drbd_work *, int);
extern int w_prev_work_done(struct drbd_conf *, struct drbd_work *, int); extern int w_prev_work_done(struct drbd_work *, int);
extern int w_e_reissue(struct drbd_conf *, struct drbd_work *, int); extern int w_e_reissue(struct drbd_work *, int);
extern int w_restart_disk_io(struct drbd_conf *, struct drbd_work *, int); extern int w_restart_disk_io(struct drbd_work *, int);
extern int w_send_oos(struct drbd_conf *, struct drbd_work *, int); extern int w_send_oos(struct drbd_work *, int);
extern int w_start_resync(struct drbd_conf *, struct drbd_work *, int); extern int w_start_resync(struct drbd_work *, int);
extern void resync_timer_fn(unsigned long data); extern void resync_timer_fn(unsigned long data);
extern void start_resync_timer_fn(unsigned long data); extern void start_resync_timer_fn(unsigned long data);
......
drivers/block/drbd/drbd_main.c
浏览文件 @ 00d56944
...@@ -64,10 +64,10 @@ int drbd_asender(struct drbd_thread *); ...@@ -64,10 +64,10 @@ int drbd_asender(struct drbd_thread *);
int drbd_init(void); int drbd_init(void);
static int drbd_open(struct block_device *bdev, fmode_t mode); static int drbd_open(struct block_device *bdev, fmode_t mode);
static int drbd_release(struct gendisk *gd, fmode_t mode); static int drbd_release(struct gendisk *gd, fmode_t mode);
static int w_md_sync(struct drbd_conf *mdev, struct drbd_work *w, int unused); static int w_md_sync(struct drbd_work *w, int unused);
static void md_sync_timer_fn(unsigned long data); static void md_sync_timer_fn(unsigned long data);
static int w_bitmap_io(struct drbd_conf *mdev, struct drbd_work *w, int unused); static int w_bitmap_io(struct drbd_work *w, int unused);
static int w_go_diskless(struct drbd_conf *mdev, struct drbd_work *w, int unused); static int w_go_diskless(struct drbd_work *w, int unused);
MODULE_AUTHOR("Philipp Reisner <phil@linbit.com>, " MODULE_AUTHOR("Philipp Reisner <phil@linbit.com>, "
"Lars Ellenberg <lars@linbit.com>"); "Lars Ellenberg <lars@linbit.com>");
...@@ -2790,9 +2790,10 @@ int drbd_bmio_clear_n_write(struct drbd_conf *mdev) ...@@ -2790,9 +2790,10 @@ int drbd_bmio_clear_n_write(struct drbd_conf *mdev)
return rv; return rv;
} }
static int w_bitmap_io(struct drbd_conf *mdev, struct drbd_work *w, int unused) static int w_bitmap_io(struct drbd_work *w, int unused)
{ {
struct bm_io_work *work = container_of(w, struct bm_io_work, w); struct bm_io_work *work = container_of(w, struct bm_io_work, w);
struct drbd_conf *mdev = w->mdev;
int rv = -EIO; int rv = -EIO;
D_ASSERT(atomic_read(&mdev->ap_bio_cnt) == 0); D_ASSERT(atomic_read(&mdev->ap_bio_cnt) == 0);
...@@ -2835,8 +2836,10 @@ void drbd_ldev_destroy(struct drbd_conf *mdev) ...@@ -2835,8 +2836,10 @@ void drbd_ldev_destroy(struct drbd_conf *mdev)
clear_bit(GO_DISKLESS, &mdev->flags); clear_bit(GO_DISKLESS, &mdev->flags);
} }
static int w_go_diskless(struct drbd_conf *mdev, struct drbd_work *w, int unused) static int w_go_diskless(struct drbd_work *w, int unused)
{ {
struct drbd_conf *mdev = w->mdev;
D_ASSERT(mdev->state.disk == D_FAILED); D_ASSERT(mdev->state.disk == D_FAILED);
/* we cannot assert local_cnt == 0 here, as get_ldev_if_state will /* we cannot assert local_cnt == 0 here, as get_ldev_if_state will
* inc/dec it frequently. Once we are D_DISKLESS, no one will touch * inc/dec it frequently. Once we are D_DISKLESS, no one will touch
...@@ -2949,8 +2952,10 @@ static void md_sync_timer_fn(unsigned long data) ...@@ -2949,8 +2952,10 @@ static void md_sync_timer_fn(unsigned long data)
drbd_queue_work_front(&mdev->tconn->data.work, &mdev->md_sync_work); drbd_queue_work_front(&mdev->tconn->data.work, &mdev->md_sync_work);
} }
static int w_md_sync(struct drbd_conf *mdev, struct drbd_work *w, int unused) static int w_md_sync(struct drbd_work *w, int unused)
{ {
struct drbd_conf *mdev = w->mdev;
dev_warn(DEV, "md_sync_timer expired! Worker calls drbd_md_sync().\n"); dev_warn(DEV, "md_sync_timer expired! Worker calls drbd_md_sync().\n");
#ifdef DEBUG #ifdef DEBUG
dev_warn(DEV, "last md_mark_dirty: %s:%u\n", dev_warn(DEV, "last md_mark_dirty: %s:%u\n",
......
drivers/block/drbd/drbd_receiver.c
浏览文件 @ 00d56944
...@@ -65,7 +65,7 @@ static int drbd_do_auth(struct drbd_tconn *tconn); ...@@ -65,7 +65,7 @@ static int drbd_do_auth(struct drbd_tconn *tconn);
static int drbd_disconnected(int vnr, void *p, void *data); static int drbd_disconnected(int vnr, void *p, void *data);
static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *, struct drbd_epoch *, enum epoch_event); static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *, struct drbd_epoch *, enum epoch_event);
static int e_end_block(struct drbd_conf *, struct drbd_work *, int); static int e_end_block(struct drbd_work *, int);
#define GFP_TRY (__GFP_HIGHMEM | __GFP_NOWARN) #define GFP_TRY (__GFP_HIGHMEM | __GFP_NOWARN)
...@@ -420,7 +420,7 @@ static int drbd_process_done_ee(struct drbd_conf *mdev) ...@@ -420,7 +420,7 @@ static int drbd_process_done_ee(struct drbd_conf *mdev)
*/ */
list_for_each_entry_safe(peer_req, t, &work_list, w.list) { list_for_each_entry_safe(peer_req, t, &work_list, w.list) {
/* list_del not necessary, next/prev members not touched */ /* list_del not necessary, next/prev members not touched */
ok = peer_req->w.cb(mdev, &peer_req->w, !ok) && ok; ok = peer_req->w.cb(&peer_req->w, !ok) && ok;
drbd_free_ee(mdev, peer_req); drbd_free_ee(mdev, peer_req);
} }
wake_up(&mdev->ee_wait); wake_up(&mdev->ee_wait);
...@@ -1447,9 +1447,10 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, ...@@ -1447,9 +1447,10 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req,
/* e_end_resync_block() is called via /* e_end_resync_block() is called via
* drbd_process_done_ee() by asender only */ * drbd_process_done_ee() by asender only */
static int e_end_resync_block(struct drbd_conf *mdev, struct drbd_work *w, int unused) static int e_end_resync_block(struct drbd_work *w, int unused)
{ {
struct drbd_peer_request *peer_req = (struct drbd_peer_request *)w; struct drbd_peer_request *peer_req = (struct drbd_peer_request *)w;
struct drbd_conf *mdev = w->mdev;
sector_t sector = peer_req->i.sector; sector_t sector = peer_req->i.sector;
int ok; int ok;
...@@ -1584,9 +1585,10 @@ static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packet cmd, ...@@ -1584,9 +1585,10 @@ static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packet cmd,
/* e_end_block() is called via drbd_process_done_ee(). /* e_end_block() is called via drbd_process_done_ee().
* this means this function only runs in the asender thread * this means this function only runs in the asender thread
*/ */
static int e_end_block(struct drbd_conf *mdev, struct drbd_work *w, int cancel) static int e_end_block(struct drbd_work *w, int cancel)
{ {
struct drbd_peer_request *peer_req = (struct drbd_peer_request *)w; struct drbd_peer_request *peer_req = (struct drbd_peer_request *)w;
struct drbd_conf *mdev = w->mdev;
sector_t sector = peer_req->i.sector; sector_t sector = peer_req->i.sector;
int ok = 1, pcmd; int ok = 1, pcmd;
...@@ -1621,9 +1623,10 @@ static int e_end_block(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -1621,9 +1623,10 @@ static int e_end_block(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
return ok; return ok;
} }
static int e_send_discard_ack(struct drbd_conf *mdev, struct drbd_work *w, int unused) static int e_send_discard_ack(struct drbd_work *w, int unused)
{ {
struct drbd_peer_request *peer_req = (struct drbd_peer_request *)w; struct drbd_peer_request *peer_req = (struct drbd_peer_request *)w;
struct drbd_conf *mdev = w->mdev;
int ok = 1; int ok = 1;
D_ASSERT(mdev->tconn->net_conf->wire_protocol == DRBD_PROT_C); D_ASSERT(mdev->tconn->net_conf->wire_protocol == DRBD_PROT_C);
......
drivers/block/drbd/drbd_state.c
浏览文件 @ 00d56944
...@@ -40,7 +40,7 @@ struct after_state_chg_work { ...@@ -40,7 +40,7 @@ struct after_state_chg_work {
extern void _tl_restart(struct drbd_conf *mdev, enum drbd_req_event what); extern void _tl_restart(struct drbd_conf *mdev, enum drbd_req_event what);
int drbd_send_state_req(struct drbd_conf *, union drbd_state, union drbd_state); int drbd_send_state_req(struct drbd_conf *, union drbd_state, union drbd_state);
static int w_after_state_ch(struct drbd_conf *mdev, struct drbd_work *w, int unused); static int w_after_state_ch(struct drbd_work *w, int unused);
static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
union drbd_state ns, enum chg_state_flags flags); union drbd_state ns, enum chg_state_flags flags);
static void after_conn_state_ch(struct drbd_tconn *tconn, union drbd_state os, static void after_conn_state_ch(struct drbd_tconn *tconn, union drbd_state os,
...@@ -853,10 +853,11 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns, ...@@ -853,10 +853,11 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns,
return rv; return rv;
} }
static int w_after_state_ch(struct drbd_conf *mdev, struct drbd_work *w, int unused) static int w_after_state_ch(struct drbd_work *w, int unused)
{ {
struct after_state_chg_work *ascw = struct after_state_chg_work *ascw =
container_of(w, struct after_state_chg_work, w); container_of(w, struct after_state_chg_work, w);
struct drbd_conf *mdev = w->mdev;
after_state_ch(mdev, ascw->os, ascw->ns, ascw->flags); after_state_ch(mdev, ascw->os, ascw->ns, ascw->flags);
if (ascw->flags & CS_WAIT_COMPLETE) { if (ascw->flags & CS_WAIT_COMPLETE) {
......
drivers/block/drbd/drbd_worker.c
浏览文件 @ 00d56944
...@@ -38,9 +38,8 @@ ...@@ -38,9 +38,8 @@
#include "drbd_int.h" #include "drbd_int.h"
#include "drbd_req.h" #include "drbd_req.h"
static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int cancel); static int w_make_ov_request(struct drbd_work *w, int cancel);
static int w_make_resync_request(struct drbd_conf *mdev, static int w_make_resync_request(struct drbd_work *w, int cancel);
struct drbd_work *w, int cancel);
...@@ -228,9 +227,10 @@ void drbd_endio_pri(struct bio *bio, int error) ...@@ -228,9 +227,10 @@ void drbd_endio_pri(struct bio *bio, int error)
complete_master_bio(mdev, &m); complete_master_bio(mdev, &m);
} }
int w_read_retry_remote(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_read_retry_remote(struct drbd_work *w, int cancel)
{ {
struct drbd_request *req = container_of(w, struct drbd_request, w); struct drbd_request *req = container_of(w, struct drbd_request, w);
struct drbd_conf *mdev = w->mdev;
/* We should not detach for read io-error, /* We should not detach for read io-error,
* but try to WRITE the P_DATA_REPLY to the failed location, * but try to WRITE the P_DATA_REPLY to the failed location,
...@@ -244,7 +244,7 @@ int w_read_retry_remote(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -244,7 +244,7 @@ int w_read_retry_remote(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
} }
spin_unlock_irq(&mdev->tconn->req_lock); spin_unlock_irq(&mdev->tconn->req_lock);
return w_send_read_req(mdev, w, 0); return w_send_read_req(w, 0);
} }
void drbd_csum_ee(struct drbd_conf *mdev, struct crypto_hash *tfm, void drbd_csum_ee(struct drbd_conf *mdev, struct crypto_hash *tfm,
...@@ -295,11 +295,10 @@ void drbd_csum_bio(struct drbd_conf *mdev, struct crypto_hash *tfm, struct bio * ...@@ -295,11 +295,10 @@ void drbd_csum_bio(struct drbd_conf *mdev, struct crypto_hash *tfm, struct bio *
crypto_hash_final(&desc, digest); crypto_hash_final(&desc, digest);
} }
/* TODO merge common code with w_e_end_ov_req */ static int w_e_send_csum(struct drbd_work *w, int cancel)
int w_e_send_csum(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{ {
struct drbd_peer_request *peer_req = struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w);
container_of(w, struct drbd_peer_request, w); struct drbd_conf *mdev = w->mdev;
int digest_size; int digest_size;
void *digest; void *digest;
int ok = 1; int ok = 1;
...@@ -383,14 +382,15 @@ static int read_for_csum(struct drbd_conf *mdev, sector_t sector, int size) ...@@ -383,14 +382,15 @@ static int read_for_csum(struct drbd_conf *mdev, sector_t sector, int size)
return -EAGAIN; return -EAGAIN;
} }
int w_resync_timer(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_resync_timer(struct drbd_work *w, int cancel)
{ {
struct drbd_conf *mdev = w->mdev;
switch (mdev->state.conn) { switch (mdev->state.conn) {
case C_VERIFY_S: case C_VERIFY_S:
w_make_ov_request(mdev, w, cancel); w_make_ov_request(w, cancel);
break; break;
case C_SYNC_TARGET: case C_SYNC_TARGET:
w_make_resync_request(mdev, w, cancel); w_make_resync_request(w, cancel);
break; break;
} }
...@@ -504,9 +504,9 @@ static int drbd_rs_number_requests(struct drbd_conf *mdev) ...@@ -504,9 +504,9 @@ static int drbd_rs_number_requests(struct drbd_conf *mdev)
return number; return number;
} }
static int w_make_resync_request(struct drbd_conf *mdev, static int w_make_resync_request(struct drbd_work *w, int cancel)
struct drbd_work *w, int cancel)
{ {
struct drbd_conf *mdev = w->mdev;
unsigned long bit; unsigned long bit;
sector_t sector; sector_t sector;
const sector_t capacity = drbd_get_capacity(mdev->this_bdev); const sector_t capacity = drbd_get_capacity(mdev->this_bdev);
...@@ -664,8 +664,9 @@ static int w_make_resync_request(struct drbd_conf *mdev, ...@@ -664,8 +664,9 @@ static int w_make_resync_request(struct drbd_conf *mdev,
return 1; return 1;
} }
static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int cancel) static int w_make_ov_request(struct drbd_work *w, int cancel)
{ {
struct drbd_conf *mdev = w->mdev;
int number, i, size; int number, i, size;
sector_t sector; sector_t sector;
const sector_t capacity = drbd_get_capacity(mdev->this_bdev); const sector_t capacity = drbd_get_capacity(mdev->this_bdev);
...@@ -707,8 +708,9 @@ static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int ca ...@@ -707,8 +708,9 @@ static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int ca
return 1; return 1;
} }
int w_ov_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_ov_finished(struct drbd_work *w, int cancel)
{ {
struct drbd_conf *mdev = w->mdev;
kfree(w); kfree(w);
ov_oos_print(mdev); ov_oos_print(mdev);
drbd_resync_finished(mdev); drbd_resync_finished(mdev);
...@@ -716,8 +718,9 @@ int w_ov_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -716,8 +718,9 @@ int w_ov_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
return 1; return 1;
} }
static int w_resync_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel) static int w_resync_finished(struct drbd_work *w, int cancel)
{ {
struct drbd_conf *mdev = w->mdev;
kfree(w); kfree(w);
drbd_resync_finished(mdev); drbd_resync_finished(mdev);
...@@ -901,9 +904,10 @@ static void move_to_net_ee_or_free(struct drbd_conf *mdev, struct drbd_peer_requ ...@@ -901,9 +904,10 @@ static void move_to_net_ee_or_free(struct drbd_conf *mdev, struct drbd_peer_requ
* @w: work object. * @w: work object.
* @cancel: The connection will be closed anyways * @cancel: The connection will be closed anyways
*/ */
int w_e_end_data_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_e_end_data_req(struct drbd_work *w, int cancel)
{ {
struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w); struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w);
struct drbd_conf *mdev = w->mdev;
int ok; int ok;
if (unlikely(cancel)) { if (unlikely(cancel)) {
...@@ -937,9 +941,10 @@ int w_e_end_data_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -937,9 +941,10 @@ int w_e_end_data_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
* @w: work object. * @w: work object.
* @cancel: The connection will be closed anyways * @cancel: The connection will be closed anyways
*/ */
int w_e_end_rsdata_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_e_end_rsdata_req(struct drbd_work *w, int cancel)
{ {
struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w); struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w);
struct drbd_conf *mdev = w->mdev;
int ok; int ok;
if (unlikely(cancel)) { if (unlikely(cancel)) {
...@@ -985,9 +990,10 @@ int w_e_end_rsdata_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -985,9 +990,10 @@ int w_e_end_rsdata_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
return ok; return ok;
} }
int w_e_end_csum_rs_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_e_end_csum_rs_req(struct drbd_work *w, int cancel)
{ {
struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w); struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w);
struct drbd_conf *mdev = w->mdev;
struct digest_info *di; struct digest_info *di;
int digest_size; int digest_size;
void *digest = NULL; void *digest = NULL;
...@@ -1047,10 +1053,10 @@ int w_e_end_csum_rs_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -1047,10 +1053,10 @@ int w_e_end_csum_rs_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
return ok; return ok;
} }
/* TODO merge common code with w_e_send_csum */ int w_e_end_ov_req(struct drbd_work *w, int cancel)
int w_e_end_ov_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{ {
struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w); struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w);
struct drbd_conf *mdev = w->mdev;
sector_t sector = peer_req->i.sector; sector_t sector = peer_req->i.sector;
unsigned int size = peer_req->i.size; unsigned int size = peer_req->i.size;
int digest_size; int digest_size;
...@@ -1105,9 +1111,10 @@ void drbd_ov_oos_found(struct drbd_conf *mdev, sector_t sector, int size) ...@@ -1105,9 +1111,10 @@ void drbd_ov_oos_found(struct drbd_conf *mdev, sector_t sector, int size)
drbd_set_out_of_sync(mdev, sector, size); drbd_set_out_of_sync(mdev, sector, size);
} }
int w_e_end_ov_reply(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_e_end_ov_reply(struct drbd_work *w, int cancel)
{ {
struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w); struct drbd_peer_request *peer_req = container_of(w, struct drbd_peer_request, w);
struct drbd_conf *mdev = w->mdev;
struct digest_info *di; struct digest_info *di;
void *digest; void *digest;
sector_t sector = peer_req->i.sector; sector_t sector = peer_req->i.sector;
...@@ -1172,16 +1179,18 @@ int w_e_end_ov_reply(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -1172,16 +1179,18 @@ int w_e_end_ov_reply(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
return ok; return ok;
} }
int w_prev_work_done(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_prev_work_done(struct drbd_work *w, int cancel)
{ {
struct drbd_wq_barrier *b = container_of(w, struct drbd_wq_barrier, w); struct drbd_wq_barrier *b = container_of(w, struct drbd_wq_barrier, w);
complete(&b->done); complete(&b->done);
return 1; return 1;
} }
int w_send_barrier(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_send_barrier(struct drbd_work *w, int cancel)
{ {
struct drbd_tl_epoch *b = container_of(w, struct drbd_tl_epoch, w); struct drbd_tl_epoch *b = container_of(w, struct drbd_tl_epoch, w);
struct drbd_conf *mdev = w->mdev;
struct p_barrier *p = &mdev->tconn->data.sbuf.barrier; struct p_barrier *p = &mdev->tconn->data.sbuf.barrier;
int ok = 1; int ok = 1;
...@@ -1210,16 +1219,18 @@ int w_send_barrier(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -1210,16 +1219,18 @@ int w_send_barrier(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
return ok; return ok;
} }
int w_send_write_hint(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_send_write_hint(struct drbd_work *w, int cancel)
{ {
struct drbd_conf *mdev = w->mdev;
if (cancel) if (cancel)
return 1; return 1;
return drbd_send_short_cmd(mdev, P_UNPLUG_REMOTE); return drbd_send_short_cmd(mdev, P_UNPLUG_REMOTE);
} }
int w_send_oos(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_send_oos(struct drbd_work *w, int cancel)
{ {
struct drbd_request *req = container_of(w, struct drbd_request, w); struct drbd_request *req = container_of(w, struct drbd_request, w);
struct drbd_conf *mdev = w->mdev;
int ok; int ok;
if (unlikely(cancel)) { if (unlikely(cancel)) {
...@@ -1239,9 +1250,10 @@ int w_send_oos(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -1239,9 +1250,10 @@ int w_send_oos(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
* @w: work object. * @w: work object.
* @cancel: The connection will be closed anyways * @cancel: The connection will be closed anyways
*/ */
int w_send_dblock(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_send_dblock(struct drbd_work *w, int cancel)
{ {
struct drbd_request *req = container_of(w, struct drbd_request, w); struct drbd_request *req = container_of(w, struct drbd_request, w);
struct drbd_conf *mdev = w->mdev;
int ok; int ok;
if (unlikely(cancel)) { if (unlikely(cancel)) {
...@@ -1261,9 +1273,10 @@ int w_send_dblock(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -1261,9 +1273,10 @@ int w_send_dblock(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
* @w: work object. * @w: work object.
* @cancel: The connection will be closed anyways * @cancel: The connection will be closed anyways
*/ */
int w_send_read_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_send_read_req(struct drbd_work *w, int cancel)
{ {
struct drbd_request *req = container_of(w, struct drbd_request, w); struct drbd_request *req = container_of(w, struct drbd_request, w);
struct drbd_conf *mdev = w->mdev;
int ok; int ok;
if (unlikely(cancel)) { if (unlikely(cancel)) {
...@@ -1285,9 +1298,10 @@ int w_send_read_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) ...@@ -1285,9 +1298,10 @@ int w_send_read_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
return ok; return ok;
} }
int w_restart_disk_io(struct drbd_conf *mdev, struct drbd_work *w, int cancel) int w_restart_disk_io(struct drbd_work *w, int cancel)
{ {
struct drbd_request *req = container_of(w, struct drbd_request, w); struct drbd_request *req = container_of(w, struct drbd_request, w);
struct drbd_conf *mdev = w->mdev;
if (bio_data_dir(req->master_bio) == WRITE && req->rq_state & RQ_IN_ACT_LOG) if (bio_data_dir(req->master_bio) == WRITE && req->rq_state & RQ_IN_ACT_LOG)
drbd_al_begin_io(mdev, req->i.sector); drbd_al_begin_io(mdev, req->i.sector);
...@@ -1447,8 +1461,10 @@ void start_resync_timer_fn(unsigned long data) ...@@ -1447,8 +1461,10 @@ void start_resync_timer_fn(unsigned long data)
drbd_queue_work(&mdev->tconn->data.work, &mdev->start_resync_work); 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) int w_start_resync(struct drbd_work *w, int cancel)
{ {
struct drbd_conf *mdev = w->mdev;
if (atomic_read(&mdev->unacked_cnt) || atomic_read(&mdev->rs_pending_cnt)) { if (atomic_read(&mdev->unacked_cnt) || atomic_read(&mdev->rs_pending_cnt)) {
dev_warn(DEV, "w_start_resync later...\n"); dev_warn(DEV, "w_start_resync later...\n");
mdev->start_resync_timer.expires = jiffies + HZ/10; mdev->start_resync_timer.expires = jiffies + HZ/10;
...@@ -1702,7 +1718,7 @@ int drbd_worker(struct drbd_thread *thi) ...@@ -1702,7 +1718,7 @@ int drbd_worker(struct drbd_thread *thi)
list_del_init(&w->list); list_del_init(&w->list);
spin_unlock_irq(&tconn->data.work.q_lock); spin_unlock_irq(&tconn->data.work.q_lock);
if (!w->cb(w->mdev, w, tconn->volume0->state.conn < C_CONNECTED)) { if (!w->cb(w, tconn->volume0->state.conn < C_CONNECTED)) {
/* dev_warn(DEV, "worker: a callback failed! \n"); */ /* dev_warn(DEV, "worker: a callback failed! \n"); */
if (tconn->volume0->state.conn >= C_CONNECTED) if (tconn->volume0->state.conn >= C_CONNECTED)
drbd_force_state(tconn->volume0, drbd_force_state(tconn->volume0,
...@@ -1718,7 +1734,7 @@ int drbd_worker(struct drbd_thread *thi) ...@@ -1718,7 +1734,7 @@ int drbd_worker(struct drbd_thread *thi)
while (!list_empty(&work_list)) { while (!list_empty(&work_list)) {
w = list_entry(work_list.next, struct drbd_work, list); w = list_entry(work_list.next, struct drbd_work, list);
list_del_init(&w->list); list_del_init(&w->list);
w->cb(w->mdev, w, 1); w->cb(w, 1);
} }
spin_lock_irq(&tconn->data.work.q_lock); spin_lock_irq(&tconn->data.work.q_lock);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或