Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84b8c06b authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Create a dedicated struct drbd_device_work 



drbd_device_work is a work item that has a reference to a device,
while drbd_work is a more generic work item that does not carry
a reference to a device.

All callbacks get a pointer to a drbd_work instance, those callbacks
that expect a drbd_device_work use the container_of macro to get it.

Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent 8682eae9

drivers/block/drbd/drbd_actlog.c

+10 −6
Original line number Diff line number Diff line
@@ -95,11 +95,13 @@ struct __packed al_transaction_on_disk { 


struct update_odbm_work {

	struct drbd_work w;

	struct drbd_device *device;

	unsigned int enr;

};



struct update_al_work {

	struct drbd_work w;

	struct drbd_device *device;

	struct completion event;

	int err;

};
@@ -594,7 +596,7 @@ _al_write_transaction(struct drbd_device *device) 
static int w_al_write_transaction(struct drbd_work *w, int unused)

{

	struct update_al_work *aw = container_of(w, struct update_al_work, w);

	struct drbd_device *device = w->device;

	struct drbd_device *device = aw->device;

	int err;



	err = _al_write_transaction(device);
@@ -613,8 +615,9 @@ static int al_write_transaction(struct drbd_device *device, bool delegate) 
		struct update_al_work al_work;

		init_completion(&al_work.event);

		al_work.w.cb = w_al_write_transaction;

		al_work.w.device = device;

		drbd_queue_work_front(&first_peer_device(device)->connection->sender_work, &al_work.w);

		al_work.device = device;

		drbd_queue_work_front(&first_peer_device(device)->connection->sender_work,

				      &al_work.w);

		wait_for_completion(&al_work.event);

		return al_work.err;

	} else
@@ -684,7 +687,7 @@ int drbd_initialize_al(struct drbd_device *device, void *buffer) 
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 drbd_device *device = w->device;

	struct drbd_device *device = udw->device;

	struct sib_info sib = { .sib_reason = SIB_SYNC_PROGRESS, };



	if (!get_ldev(device)) {
@@ -795,8 +798,9 @@ static void drbd_try_clear_on_disk_bm(struct drbd_device *device, sector_t secto 
			if (udw) {

				udw->enr = ext->lce.lc_number;

				udw->w.cb = w_update_odbm;

				udw->w.device = device;

				drbd_queue_work_front(&first_peer_device(device)->connection->sender_work, &udw->w);

				udw->device = device;

				drbd_queue_work_front(&first_peer_device(device)->connection->sender_work,

						      &udw->w);

			} else {

				drbd_warn(device, "Could not kmalloc an udw\n");

			}

drivers/block/drbd/drbd_int.h

+17 −12
Original line number Diff line number Diff line
@@ -281,10 +281,11 @@ static inline enum drbd_thread_state get_t_state(struct drbd_thread *thi) 
struct drbd_work {

	struct list_head list;

	int (*cb)(struct drbd_work *, int cancel);

	union {

		struct drbd_device *device;

		struct drbd_connection *connection;

};



struct drbd_device_work {

	struct drbd_work w;

	struct drbd_device *device;

};



#include "drbd_interval.h"
@@ -293,6 +294,7 @@ extern int drbd_wait_misc(struct drbd_device *, struct drbd_interval *); 


struct drbd_request {

	struct drbd_work w;

	struct drbd_device *device;



	/* if local IO is not allowed, will be NULL.

	 * if local IO _is_ allowed, holds the locally submitted bio clone,
@@ -360,7 +362,7 @@ struct digest_info { 
};



struct drbd_peer_request {

	struct drbd_work w;

	struct drbd_device_work dw;

	struct drbd_epoch *epoch; /* for writes */

	struct page *pages;

	atomic_t pending_bios;
@@ -686,11 +688,11 @@ struct drbd_device { 
	struct gendisk	    *vdisk;



	unsigned long last_reattach_jif;

	struct drbd_work  resync_work,

			  unplug_work,

			  go_diskless,

			  md_sync_work,

			  start_resync_work;

	struct drbd_work resync_work;

	struct drbd_work unplug_work;

	struct drbd_work go_diskless;

	struct drbd_work md_sync_work;

	struct drbd_work start_resync_work;

	struct timer_list resync_timer;

	struct timer_list md_sync_timer;

	struct timer_list start_resync_timer;
@@ -1865,7 +1867,8 @@ static inline void put_ldev(struct drbd_device *device) 
		if (device->state.disk == D_FAILED) {

			/* all application IO references gone. */

			if (!test_and_set_bit(GO_DISKLESS, &device->flags))

				drbd_queue_work(&first_peer_device(device)->connection->sender_work, &device->go_diskless);

				drbd_queue_work(&first_peer_device(device)->connection->sender_work,

						&device->go_diskless);

		}

		wake_up(&device->misc_wait);

	}
@@ -2092,7 +2095,9 @@ static inline void dec_ap_bio(struct drbd_device *device) 


	if (ap_bio == 0 && test_bit(BITMAP_IO, &device->flags)) {

		if (!test_and_set_bit(BITMAP_IO_QUEUED, &device->flags))

			drbd_queue_work(&first_peer_device(device)->connection->sender_work, &device->bm_io_work.w);

			drbd_queue_work(&first_peer_device(device)->

				connection->sender_work,

				&device->bm_io_work.w);

	}



	/* this currently does wake_up for every dec_ap_bio!

drivers/block/drbd/drbd_main.c

+15 −17
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ void tl_abort_disk_io(struct drbd_device *device) 
	list_for_each_entry_safe(req, r, &connection->transfer_log, tl_requests) {

		if (!(req->rq_state & RQ_LOCAL_PENDING))

			continue;

		if (req->w.device != device)

		if (req->device != device)

			continue;

		_req_mod(req, ABORT_DISK_IO);

	}
@@ -1917,13 +1917,6 @@ void drbd_init_set_defaults(struct drbd_device *device) 
	device->bm_io_work.w.cb = w_bitmap_io;

	device->start_resync_work.cb = w_start_resync;



	device->resync_work.device  = device;

	device->unplug_work.device  = device;

	device->go_diskless.device  = device;

	device->md_sync_work.device = device;

	device->bm_io_work.w.device = device;

	device->start_resync_work.device = device;



	init_timer(&device->resync_timer);

	init_timer(&device->md_sync_timer);

	init_timer(&device->start_resync_timer);
@@ -2222,7 +2215,7 @@ static void do_retry(struct work_struct *ws) 
	spin_unlock_irq(&retry->lock);



	list_for_each_entry_safe(req, tmp, &writes, tl_requests) {

		struct drbd_device *device = req->w.device;

		struct drbd_device *device = req->device;

		struct bio *bio = req->master_bio;

		unsigned long start_time = req->start_time;

		bool expected;
@@ -2273,7 +2266,7 @@ void drbd_restart_request(struct drbd_request *req) 
	/* Drop the extra reference that would otherwise

	 * have been dropped by complete_master_bio.

	 * do_retry() needs to grab a new one. */

	dec_ap_bio(req->w.device);

	dec_ap_bio(req->device);



	queue_work(retry.wq, &retry.worker);

}
@@ -3468,8 +3461,9 @@ int drbd_bmio_clear_n_write(struct drbd_device *device) 


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 drbd_device *device = w->device;

	struct drbd_device *device =

		container_of(w, struct drbd_device, bm_io_work.w);

	struct bm_io_work *work = &device->bm_io_work;

	int rv = -EIO;



	D_ASSERT(device, atomic_read(&device->ap_bio_cnt) == 0);
@@ -3509,7 +3503,8 @@ void drbd_ldev_destroy(struct drbd_device *device) 


static int w_go_diskless(struct drbd_work *w, int unused)

{

	struct drbd_device *device = w->device;

	struct drbd_device *device =

		container_of(w, struct drbd_device, go_diskless);



	D_ASSERT(device, device->state.disk == D_FAILED);

	/* we cannot assert local_cnt == 0 here, as get_ldev_if_state will
@@ -3583,7 +3578,8 @@ void drbd_queue_bitmap_io(struct drbd_device *device, 
	set_bit(BITMAP_IO, &device->flags);

	if (atomic_read(&device->ap_bio_cnt) == 0) {

		if (!test_and_set_bit(BITMAP_IO_QUEUED, &device->flags))

			drbd_queue_work(&first_peer_device(device)->connection->sender_work, &device->bm_io_work.w);

			drbd_queue_work(&first_peer_device(device)->connection->sender_work,

					&device->bm_io_work.w);

	}

	spin_unlock_irq(&device->resource->req_lock);

}
@@ -3643,12 +3639,14 @@ static void md_sync_timer_fn(unsigned long data) 


	/* must not double-queue! */

	if (list_empty(&device->md_sync_work.list))

		drbd_queue_work_front(&first_peer_device(device)->connection->sender_work, &device->md_sync_work);

		drbd_queue_work_front(&first_peer_device(device)->connection->sender_work,

				      &device->md_sync_work);

}



static int w_md_sync(struct drbd_work *w, int unused)

{

	struct drbd_device *device = w->device;

	struct drbd_device *device =

		container_of(w, struct drbd_device, md_sync_work);



	drbd_warn(device, "md_sync_timer expired! Worker calls drbd_md_sync().\n");

#ifdef DEBUG

drivers/block/drbd/drbd_receiver.c

+43 −41
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static void reclaim_finished_net_peer_reqs(struct drbd_device *device, 
	   stop to examine the list... */



	list_for_each_safe(le, tle, &device->net_ee) {

		peer_req = list_entry(le, struct drbd_peer_request, w.list);

		peer_req = list_entry(le, struct drbd_peer_request, dw.w.list);

		if (drbd_peer_req_has_active_page(peer_req))

			break;

		list_move(le, to_be_freed);
@@ -225,7 +225,7 @@ static void drbd_kick_lo_and_reclaim_net(struct drbd_device *device) 
	reclaim_finished_net_peer_reqs(device, &reclaimed);

	spin_unlock_irq(&device->resource->req_lock);



	list_for_each_entry_safe(peer_req, t, &reclaimed, w.list)

	list_for_each_entry_safe(peer_req, t, &reclaimed, dw.w.list)

		drbd_free_net_peer_req(device, peer_req);

}
@@ -363,7 +363,7 @@ drbd_alloc_peer_req(struct drbd_peer_device *peer_device, u64 id, sector_t secto 
	peer_req->i.waiting = false;



	peer_req->epoch = NULL;

	peer_req->w.device = device;

	peer_req->dw.device = device;

	peer_req->pages = page;

	atomic_set(&peer_req->pending_bios, 0);

	peer_req->flags = 0;
@@ -402,7 +402,7 @@ int drbd_free_peer_reqs(struct drbd_device *device, struct list_head *list) 
	list_splice_init(list, &work_list);

	spin_unlock_irq(&device->resource->req_lock);



	list_for_each_entry_safe(peer_req, t, &work_list, w.list) {

	list_for_each_entry_safe(peer_req, t, &work_list, dw.w.list) {

		__drbd_free_peer_req(device, peer_req, is_net);

		count++;

	}
@@ -424,18 +424,18 @@ static int drbd_finish_peer_reqs(struct drbd_device *device) 
	list_splice_init(&device->done_ee, &work_list);

	spin_unlock_irq(&device->resource->req_lock);



	list_for_each_entry_safe(peer_req, t, &reclaimed, w.list)

	list_for_each_entry_safe(peer_req, t, &reclaimed, dw.w.list)

		drbd_free_net_peer_req(device, peer_req);



	/* possible callbacks here:

	 * e_end_block, and e_end_resync_block, e_send_superseded.

	 * all ignore the last argument.

	 */

	list_for_each_entry_safe(peer_req, t, &work_list, w.list) {

	list_for_each_entry_safe(peer_req, t, &work_list, dw.w.list) {

		int err2;



		/* list_del not necessary, next/prev members not touched */

		err2 = peer_req->w.cb(&peer_req->w, !!err);

		err2 = peer_req->dw.w.cb(&peer_req->dw.w, !!err);

		if (!err)

			err = err2;

		drbd_free_peer_req(device, peer_req);
@@ -1664,9 +1664,10 @@ static int recv_dless_read(struct drbd_peer_device *peer_device, struct drbd_req 
 */

static int e_end_resync_block(struct drbd_work *w, int unused)

{

	struct drbd_device_work *dw = device_work(w);

	struct drbd_peer_request *peer_req =

		container_of(w, struct drbd_peer_request, w);

	struct drbd_device *device = w->device;

		container_of(dw, struct drbd_peer_request, dw);

	struct drbd_device *device = dw->device;

	sector_t sector = peer_req->i.sector;

	int err;
@@ -1702,10 +1703,10 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto 
	/* corresponding dec_unacked() in e_end_resync_block()

	 * respective _drbd_clear_done_ee */



	peer_req->w.cb = e_end_resync_block;

	peer_req->dw.w.cb = e_end_resync_block;



	spin_lock_irq(&device->resource->req_lock);

	list_add(&peer_req->w.list, &device->sync_ee);

	list_add(&peer_req->dw.w.list, &device->sync_ee);

	spin_unlock_irq(&device->resource->req_lock);



	atomic_add(data_size >> 9, &device->rs_sect_ev);
@@ -1715,7 +1716,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto 
	/* don't care for the reason here */

	drbd_err(device, "submit failed, triggering re-connect\n");

	spin_lock_irq(&device->resource->req_lock);

	list_del(&peer_req->w.list);

	list_del(&peer_req->dw.w.list);

	spin_unlock_irq(&device->resource->req_lock);



	drbd_free_peer_req(device, peer_req);
@@ -1835,9 +1836,10 @@ static void restart_conflicting_writes(struct drbd_device *device, 
 */

static int e_end_block(struct drbd_work *w, int cancel)

{

	struct drbd_device_work *dw = device_work(w);

	struct drbd_peer_request *peer_req =

		container_of(w, struct drbd_peer_request, w);

	struct drbd_device *device = w->device;

		container_of(dw, struct drbd_peer_request, dw);

	struct drbd_device *device = dw->device;

	sector_t sector = peer_req->i.sector;

	int err = 0, pcmd;
@@ -1874,11 +1876,11 @@ static int e_end_block(struct drbd_work *w, int cancel) 
	return err;

}



static int e_send_ack(struct drbd_work *w, enum drbd_packet ack)

static int e_send_ack(struct drbd_device_work *dw, enum drbd_packet ack)

{

	struct drbd_device *device = w->device;

	struct drbd_device *device = dw->device;

	struct drbd_peer_request *peer_req =

		container_of(w, struct drbd_peer_request, w);

		container_of(dw, struct drbd_peer_request, dw);

	int err;



	err = drbd_send_ack(first_peer_device(device), ack, peer_req);
@@ -1889,14 +1891,15 @@ static int e_send_ack(struct drbd_work *w, enum drbd_packet ack) 


static int e_send_superseded(struct drbd_work *w, int unused)

{

	return e_send_ack(w, P_SUPERSEDED);

	return e_send_ack(device_work(w), P_SUPERSEDED);

}



static int e_send_retry_write(struct drbd_work *w, int unused)

{

	struct drbd_connection *connection = first_peer_device(w->device)->connection;

	struct drbd_device_work *dw = device_work(w);

	struct drbd_connection *connection = first_peer_device(dw->device)->connection;



	return e_send_ack(w, connection->agreed_pro_version >= 100 ?

	return e_send_ack(dw, connection->agreed_pro_version >= 100 ?

			     P_RETRY_WRITE : P_SUPERSEDED);

}
@@ -1943,7 +1946,7 @@ static bool overlapping_resync_write(struct drbd_device *device, struct drbd_pee 
	bool rv = 0;



	spin_lock_irq(&device->resource->req_lock);

	list_for_each_entry(rs_req, &device->sync_ee, w.list) {

	list_for_each_entry(rs_req, &device->sync_ee, dw.w.list) {

		if (overlaps(peer_req->i.sector, peer_req->i.size,

			     rs_req->i.sector, rs_req->i.size)) {

			rv = 1;
@@ -2114,9 +2117,9 @@ static int handle_write_conflicts(struct drbd_device *device, 
					  superseded ? "local" : "remote");



			inc_unacked(device);

			peer_req->w.cb = superseded ? e_send_superseded :

			peer_req->dw.w.cb = superseded ? e_send_superseded :

						   e_send_retry_write;

			list_add_tail(&peer_req->w.list, &device->done_ee);

			list_add_tail(&peer_req->dw.w.list, &device->done_ee);

			wake_asender(first_peer_device(device)->connection);



			err = -ENOENT;
@@ -2212,7 +2215,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info * 
		return -EIO;

	}



	peer_req->w.cb = e_end_block;

	peer_req->dw.w.cb = e_end_block;



	dp_flags = be32_to_cpu(p->dp_flags);

	rw |= wire_flags_to_bio(device, dp_flags);
@@ -2252,7 +2255,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info * 
		update_peer_seq(peer_device, peer_seq);

		spin_lock_irq(&device->resource->req_lock);

	}

	list_add(&peer_req->w.list, &device->active_ee);

	list_add(&peer_req->dw.w.list, &device->active_ee);

	spin_unlock_irq(&device->resource->req_lock);



	if (device->state.conn == C_SYNC_TARGET)
@@ -2299,7 +2302,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info * 
	/* don't care for the reason here */

	drbd_err(device, "submit failed, triggering re-connect\n");

	spin_lock_irq(&device->resource->req_lock);

	list_del(&peer_req->w.list);

	list_del(&peer_req->dw.w.list);

	drbd_remove_epoch_entry_interval(device, peer_req);

	spin_unlock_irq(&device->resource->req_lock);

	if (peer_req->flags & EE_CALL_AL_COMPLETE_IO)
@@ -2454,13 +2457,13 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet 


	switch (pi->cmd) {

	case P_DATA_REQUEST:

		peer_req->w.cb = w_e_end_data_req;

		peer_req->dw.w.cb = w_e_end_data_req;

		fault_type = DRBD_FAULT_DT_RD;

		/* application IO, don't drbd_rs_begin_io */

		goto submit;



	case P_RS_DATA_REQUEST:

		peer_req->w.cb = w_e_end_rsdata_req;

		peer_req->dw.w.cb = w_e_end_rsdata_req;

		fault_type = DRBD_FAULT_RS_RD;

		/* used in the sector offset progress display */

		device->bm_resync_fo = BM_SECT_TO_BIT(sector);
@@ -2484,13 +2487,13 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet 


		if (pi->cmd == P_CSUM_RS_REQUEST) {

			D_ASSERT(device, peer_device->connection->agreed_pro_version >= 89);

			peer_req->w.cb = w_e_end_csum_rs_req;

			peer_req->dw.w.cb = w_e_end_csum_rs_req;

			/* used in the sector offset progress display */

			device->bm_resync_fo = BM_SECT_TO_BIT(sector);

		} else if (pi->cmd == P_OV_REPLY) {

			/* track progress, we may need to throttle */

			atomic_add(size >> 9, &device->rs_sect_in);

			peer_req->w.cb = w_e_end_ov_reply;

			peer_req->dw.w.cb = w_e_end_ov_reply;

			dec_rs_pending(device);

			/* drbd_rs_begin_io done when we sent this request,

			 * but accounting still needs to be done. */
@@ -2514,7 +2517,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet 
			drbd_info(device, "Online Verify start sector: %llu\n",

					(unsigned long long)sector);

		}

		peer_req->w.cb = w_e_end_ov_req;

		peer_req->dw.w.cb = w_e_end_ov_req;

		fault_type = DRBD_FAULT_RS_RD;

		break;
@@ -2555,7 +2558,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet 
submit:

	inc_unacked(device);

	spin_lock_irq(&device->resource->req_lock);

	list_add_tail(&peer_req->w.list, &device->read_ee);

	list_add_tail(&peer_req->dw.w.list, &device->read_ee);

	spin_unlock_irq(&device->resource->req_lock);



	if (drbd_submit_peer_request(device, peer_req, READ, fault_type) == 0)
@@ -2564,7 +2567,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet 
	/* don't care for the reason here */

	drbd_err(device, "submit failed, triggering re-connect\n");

	spin_lock_irq(&device->resource->req_lock);

	list_del(&peer_req->w.list);

	list_del(&peer_req->dw.w.list);

	spin_unlock_irq(&device->resource->req_lock);

	/* no drbd_rs_complete_io(), we are dropping the connection anyways */
@@ -4495,7 +4498,6 @@ void conn_flush_workqueue(struct drbd_connection *connection) 
	struct drbd_wq_barrier barr;



	barr.w.cb = w_complete;

	barr.w.connection = connection;

	init_completion(&barr.done);

	drbd_queue_work(&connection->sender_work, &barr.w);

	wait_for_completion(&barr.done);
@@ -5218,7 +5220,7 @@ static int got_OVResult(struct drbd_connection *connection, struct packet_info * 
	struct drbd_peer_device *peer_device;

	struct drbd_device *device;

	struct p_block_ack *p = pi->data;

	struct drbd_work *w;

	struct drbd_device_work *dw;

	sector_t sector;

	int size;
@@ -5250,13 +5252,13 @@ static int got_OVResult(struct drbd_connection *connection, struct packet_info * 
		drbd_advance_rs_marks(device, device->ov_left);



	if (device->ov_left == 0) {

		w = kmalloc(sizeof(*w), GFP_NOIO);

		if (w) {

			w->cb = w_ov_finished;

			w->device = device;

			drbd_queue_work(&peer_device->connection->sender_work, w);

		dw = kmalloc(sizeof(*dw), GFP_NOIO);

		if (dw) {

			dw->w.cb = w_ov_finished;

			dw->device = device;

			drbd_queue_work(&peer_device->connection->sender_work, &dw->w);

		} else {

			drbd_err(device, "kmalloc(w) failed.");

			drbd_err(device, "kmalloc(dw) failed.");

			ov_out_of_sync_print(device);

			drbd_resync_finished(device);

		}

drivers/block/drbd/drbd_req.c

+23 −18
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static struct drbd_request *drbd_req_new(struct drbd_device *device, 


	drbd_req_make_private_bio(req, bio_src);

	req->rq_state    = bio_data_dir(bio_src) == WRITE ? RQ_WRITE : 0;

	req->w.device      = device;

	req->device   = device;

	req->master_bio  = bio_src;

	req->epoch       = 0;
@@ -95,7 +95,7 @@ static struct drbd_request *drbd_req_new(struct drbd_device *device, 
void drbd_req_destroy(struct kref *kref)

{

	struct drbd_request *req = container_of(kref, struct drbd_request, kref);

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	const unsigned s = req->rq_state;



	if ((req->master_bio && !(s & RQ_POSTPONED)) ||
@@ -191,7 +191,7 @@ void complete_master_bio(struct drbd_device *device, 
static void drbd_remove_request_interval(struct rb_root *root,

					 struct drbd_request *req)

{

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	struct drbd_interval *i = &req->i;



	drbd_remove_interval(root, i);
@@ -211,7 +211,7 @@ static 
void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m)

{

	const unsigned s = req->rq_state;

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	int rw;

	int error, ok;
@@ -306,7 +306,7 @@ void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m) 


static int drbd_req_put_completion_ref(struct drbd_request *req, struct bio_and_error *m, int put)

{

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	D_ASSERT(device, m || (req->rq_state & RQ_POSTPONED));



	if (!atomic_sub_and_test(put, &req->completion_ref))
@@ -329,7 +329,7 @@ static int drbd_req_put_completion_ref(struct drbd_request *req, struct bio_and_ 
static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m,

		int clear, int set)

{

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	unsigned s = req->rq_state;

	int c_put = 0;

	int k_put = 0;
@@ -454,7 +454,7 @@ static void drbd_report_io_error(struct drbd_device *device, struct drbd_request 
int __req_mod(struct drbd_request *req, enum drbd_req_event what,

		struct bio_and_error *m)

{

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	struct net_conf *nc;

	int p, rv = 0;
@@ -542,7 +542,8 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, 
		D_ASSERT(device, (req->rq_state & RQ_LOCAL_MASK) == 0);

		mod_rq_state(req, m, 0, RQ_NET_QUEUED);

		req->w.cb = w_send_read_req;

		drbd_queue_work(&first_peer_device(device)->connection->sender_work, &req->w);

		drbd_queue_work(&first_peer_device(device)->connection->sender_work,

				&req->w);

		break;



	case QUEUE_FOR_NET_WRITE:
@@ -577,7 +578,8 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, 
		D_ASSERT(device, req->rq_state & RQ_NET_PENDING);

		mod_rq_state(req, m, 0, RQ_NET_QUEUED|RQ_EXP_BARR_ACK);

		req->w.cb =  w_send_dblock;

		drbd_queue_work(&first_peer_device(device)->connection->sender_work, &req->w);

		drbd_queue_work(&first_peer_device(device)->connection->sender_work,

				&req->w);



		/* close the epoch, in case it outgrew the limit */

		rcu_read_lock();
@@ -592,7 +594,8 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, 
	case QUEUE_FOR_SEND_OOS:

		mod_rq_state(req, m, 0, RQ_NET_QUEUED);

		req->w.cb =  w_send_out_of_sync;

		drbd_queue_work(&first_peer_device(device)->connection->sender_work, &req->w);

		drbd_queue_work(&first_peer_device(device)->connection->sender_work,

				&req->w);

		break;



	case READ_RETRY_REMOTE_CANCELED:
@@ -704,7 +707,8 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, 


		get_ldev(device); /* always succeeds in this call path */

		req->w.cb = w_restart_disk_io;

		drbd_queue_work(&first_peer_device(device)->connection->sender_work, &req->w);

		drbd_queue_work(&first_peer_device(device)->connection->sender_work,

				&req->w);

		break;



	case RESEND:
@@ -720,12 +724,13 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, 
		   Throwing them out of the TL here by pretending we got a BARRIER_ACK.

		   During connection handshake, we ensure that the peer was not rebooted. */

		if (!(req->rq_state & RQ_NET_OK)) {

			/* FIXME could this possibly be a req->w.cb == w_send_out_of_sync?

			/* FIXME could this possibly be a req->dw.cb == w_send_out_of_sync?

			 * in that case we must not set RQ_NET_PENDING. */



			mod_rq_state(req, m, RQ_COMPLETION_SUSP, RQ_NET_QUEUED|RQ_NET_PENDING);

			if (req->w.cb) {

				drbd_queue_work(&first_peer_device(device)->connection->sender_work, &req->w);

				drbd_queue_work(&first_peer_device(device)->connection->sender_work,

						&req->w);

				rv = req->rq_state & RQ_WRITE ? MR_WRITE : MR_READ;

			} /* else: FIXME can this happen? */

			break;
@@ -835,7 +840,7 @@ static bool remote_due_to_read_balancing(struct drbd_device *device, sector_t se 
static void complete_conflicting_writes(struct drbd_request *req)

{

	DEFINE_WAIT(wait);

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	struct drbd_interval *i;

	sector_t sector = req->i.sector;

	int size = req->i.size;
@@ -915,7 +920,7 @@ static void maybe_pull_ahead(struct drbd_device *device) 
 */

static bool do_remote_read(struct drbd_request *req)

{

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	enum drbd_read_balancing rbm;



	if (req->private_bio) {
@@ -960,7 +965,7 @@ static bool do_remote_read(struct drbd_request *req) 
 * which does NOT include those that we are L_AHEAD for. */

static int drbd_process_write_request(struct drbd_request *req)

{

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	int remote, send_oos;



	remote = drbd_should_do_remote(device->state);
@@ -997,7 +1002,7 @@ static int drbd_process_write_request(struct drbd_request *req) 
static void

drbd_submit_req_private_bio(struct drbd_request *req)

{

	struct drbd_device *device = req->w.device;

	struct drbd_device *device = req->device;

	struct bio *bio = req->private_bio;

	const int rw = bio_rw(bio);
@@ -1390,7 +1395,7 @@ void request_timer_fn(unsigned long data) 
		drbd_warn(device, "Remote failed to finish a request within ko-count * timeout\n");

		_drbd_set_state(_NS(device, conn, C_TIMEOUT), CS_VERBOSE | CS_HARD, NULL);

	}

	if (dt && req->rq_state & RQ_LOCAL_PENDING && req->w.device == device &&

	if (dt && req->rq_state & RQ_LOCAL_PENDING && req->device == device &&

		 time_after(now, req->start_time + dt) &&

		!time_in_range(now, device->last_reattach_jif, device->last_reattach_jif + dt)) {

		drbd_warn(device, "Local backing device failed to meet the disk-timeout\n");