Commit 69a22773 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Pass a peer device to a number of fuctions 



These functions actually operate on a peer device, or
need a peer device.

drbd_prepare_command(), drbd_send_command(), drbd_send_sync_param()
drbd_send_uuids(), drbd_gen_and_send_sync_uuid(), drbd_send_sizes()
drbd_send_state(), drbd_send_current_state(), and drbd_send_state_req()
drbd_send_sr_reply(), drbd_send_ack(), drbd_send_drequest(),
drbd_send_drequest_csum(), drbd_send_ov_request(), drbd_send_dblock()
drbd_send_block(), drbd_send_out_of_sync(), recv_dless_read()
drbd_drain_block(), receive_bitmap_plain(), recv_resync_read()
read_in_block(), read_for_csum(), drbd_alloc_pages(), drbd_alloc_peer_req()
need_peer_seq(), update_peer_seq(), wait_for_and_update_peer_seq()
drbd_sync_handshake(), drbd_asb_recover_{0,1,2}p(), drbd_connected()
drbd_disconnected(), decode_bitmap_c() and recv_bm_rle_bits()

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

drivers/block/drbd/drbd_int.h

+24 −24
Original line number Diff line number Diff line
@@ -887,36 +887,36 @@ extern int drbd_send_all(struct drbd_connection *, struct socket *, void *, size 


extern int __drbd_send_protocol(struct drbd_connection *connection, enum drbd_packet cmd);

extern int drbd_send_protocol(struct drbd_connection *connection);

extern int drbd_send_uuids(struct drbd_device *device);

extern int drbd_send_uuids_skip_initial_sync(struct drbd_device *device);

extern void drbd_gen_and_send_sync_uuid(struct drbd_device *device);

extern int drbd_send_sizes(struct drbd_device *device, int trigger_reply, enum dds_flags flags);

extern int drbd_send_state(struct drbd_device *device, union drbd_state s);

extern int drbd_send_current_state(struct drbd_device *device);

extern int drbd_send_sync_param(struct drbd_device *device);

extern int drbd_send_uuids(struct drbd_peer_device *);

extern int drbd_send_uuids_skip_initial_sync(struct drbd_peer_device *);

extern void drbd_gen_and_send_sync_uuid(struct drbd_peer_device *);

extern int drbd_send_sizes(struct drbd_peer_device *, int trigger_reply, enum dds_flags flags);

extern int drbd_send_state(struct drbd_peer_device *, union drbd_state s);

extern int drbd_send_current_state(struct drbd_peer_device *);

extern int drbd_send_sync_param(struct drbd_peer_device *);

extern void drbd_send_b_ack(struct drbd_connection *connection, u32 barrier_nr,

			    u32 set_size);

extern int drbd_send_ack(struct drbd_device *, enum drbd_packet,

extern int drbd_send_ack(struct drbd_peer_device *, enum drbd_packet,

			 struct drbd_peer_request *);

extern void drbd_send_ack_rp(struct drbd_device *device, enum drbd_packet cmd,

extern void drbd_send_ack_rp(struct drbd_peer_device *, enum drbd_packet,

			     struct p_block_req *rp);

extern void drbd_send_ack_dp(struct drbd_device *device, enum drbd_packet cmd,

extern void drbd_send_ack_dp(struct drbd_peer_device *, enum drbd_packet,

			     struct p_data *dp, int data_size);

extern int drbd_send_ack_ex(struct drbd_device *device, enum drbd_packet cmd,

extern int drbd_send_ack_ex(struct drbd_peer_device *, enum drbd_packet,

			    sector_t sector, int blksize, u64 block_id);

extern int drbd_send_out_of_sync(struct drbd_device *, struct drbd_request *);

extern int drbd_send_block(struct drbd_device *, enum drbd_packet,

extern int drbd_send_out_of_sync(struct drbd_peer_device *, struct drbd_request *);

extern int drbd_send_block(struct drbd_peer_device *, enum drbd_packet,

			   struct drbd_peer_request *);

extern int drbd_send_dblock(struct drbd_device *device, struct drbd_request *req);

extern int drbd_send_drequest(struct drbd_device *device, int cmd,

extern int drbd_send_dblock(struct drbd_peer_device *, struct drbd_request *req);

extern int drbd_send_drequest(struct drbd_peer_device *, int cmd,

			      sector_t sector, int size, u64 block_id);

extern int drbd_send_drequest_csum(struct drbd_device *device, sector_t sector,

extern int drbd_send_drequest_csum(struct drbd_peer_device *, sector_t sector,

				   int size, void *digest, int digest_size,

				   enum drbd_packet cmd);

extern int drbd_send_ov_request(struct drbd_device *device, sector_t sector, int size);

extern int drbd_send_ov_request(struct drbd_peer_device *, sector_t sector, int size);



extern int drbd_send_bitmap(struct drbd_device *device);

extern void drbd_send_sr_reply(struct drbd_device *device, enum drbd_state_rv retcode);

extern void drbd_send_sr_reply(struct drbd_peer_device *, enum drbd_state_rv retcode);

extern void conn_send_sr_reply(struct drbd_connection *connection, enum drbd_state_rv retcode);

extern void drbd_free_bc(struct drbd_backing_dev *ldev);

extern void drbd_device_cleanup(struct drbd_device *device);
@@ -1343,18 +1343,18 @@ extern int drbd_submit_peer_request(struct drbd_device *, 
				    struct drbd_peer_request *, const unsigned,

				    const int);

extern int drbd_free_peer_reqs(struct drbd_device *, struct list_head *);

extern struct drbd_peer_request *drbd_alloc_peer_req(struct drbd_device *, u64,

extern struct drbd_peer_request *drbd_alloc_peer_req(struct drbd_peer_device *, u64,

						     sector_t, unsigned int,

						     gfp_t) __must_hold(local);

extern void __drbd_free_peer_req(struct drbd_device *, struct drbd_peer_request *,

				 int);

#define drbd_free_peer_req(m,e) __drbd_free_peer_req(m, e, 0)

#define drbd_free_net_peer_req(m,e) __drbd_free_peer_req(m, e, 1)

extern struct page *drbd_alloc_pages(struct drbd_device *, unsigned int, bool);

extern struct page *drbd_alloc_pages(struct drbd_peer_device *, unsigned int, bool);

extern void drbd_set_recv_tcq(struct drbd_device *device, int tcq_enabled);

extern void _drbd_clear_done_ee(struct drbd_device *device, struct list_head *to_be_freed);

extern void conn_flush_workqueue(struct drbd_connection *connection);

extern int drbd_connected(struct drbd_device *device);

extern int drbd_connected(struct drbd_peer_device *);

static inline void drbd_flush_workqueue(struct drbd_device *device)

{

	conn_flush_workqueue(first_peer_device(device)->connection);
@@ -1726,17 +1726,17 @@ static inline void request_ping(struct drbd_connection *connection) 
}



extern void *conn_prepare_command(struct drbd_connection *, struct drbd_socket *);

extern void *drbd_prepare_command(struct drbd_device *, struct drbd_socket *);

extern void *drbd_prepare_command(struct drbd_peer_device *, struct drbd_socket *);

extern int conn_send_command(struct drbd_connection *, struct drbd_socket *,

			     enum drbd_packet, unsigned int, void *,

			     unsigned int);

extern int drbd_send_command(struct drbd_device *, struct drbd_socket *,

extern int drbd_send_command(struct drbd_peer_device *, struct drbd_socket *,

			     enum drbd_packet, unsigned int, void *,

			     unsigned int);



extern int drbd_send_ping(struct drbd_connection *connection);

extern int drbd_send_ping_ack(struct drbd_connection *connection);

extern int drbd_send_state_req(struct drbd_device *, union drbd_state, union drbd_state);

extern int drbd_send_state_req(struct drbd_peer_device *, union drbd_state, union drbd_state);

extern int conn_send_state_req(struct drbd_connection *, union drbd_state, union drbd_state);



static inline void drbd_thread_stop(struct drbd_thread *thi)

drivers/block/drbd/drbd_main.c

+133 −127

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_nl.c

+18 −9
Original line number Diff line number Diff line
@@ -678,8 +678,8 @@ drbd_set_role(struct drbd_device *device, enum drbd_role new_role, int force) 
	if (device->state.conn >= C_WF_REPORT_PARAMS) {

		/* if this was forced, we should consider sync */

		if (forced)

			drbd_send_uuids(device);

		drbd_send_current_state(device);

			drbd_send_uuids(first_peer_device(device));

		drbd_send_current_state(first_peer_device(device));

	}



	drbd_md_sync(device);
@@ -1364,8 +1364,12 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info) 


	drbd_md_sync(device);



	if (device->state.conn >= C_CONNECTED)

		drbd_send_sync_param(device);

	if (device->state.conn >= C_CONNECTED) {

		struct drbd_peer_device *peer_device;



		for_each_peer_device(peer_device, device)

			drbd_send_sync_param(peer_device);

	}



	synchronize_rcu();

	kfree(old_disk_conf);
@@ -2145,8 +2149,13 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info) 
	synchronize_rcu();

	kfree(old_net_conf);



	if (connection->cstate >= C_WF_REPORT_PARAMS)

		drbd_send_sync_param(minor_to_device(conn_lowest_minor(connection)));

	if (connection->cstate >= C_WF_REPORT_PARAMS) {

		struct drbd_peer_device *peer_device;

		int vnr;



		idr_for_each_entry(&connection->peer_devices, peer_device, vnr)

			drbd_send_sync_param(peer_device);

	}



	goto done;
@@ -2514,8 +2523,8 @@ int drbd_adm_resize(struct sk_buff *skb, struct genl_info *info) 
		if (dd == DS_GREW)

			set_bit(RESIZE_PENDING, &device->flags);



		drbd_send_uuids(device);

		drbd_send_sizes(device, 1, ddsf);

		drbd_send_uuids(first_peer_device(device));

		drbd_send_sizes(first_peer_device(device), 1, ddsf);

	}



 fail:
@@ -3244,7 +3253,7 @@ int drbd_adm_new_c_uuid(struct sk_buff *skb, struct genl_info *info) 
			retcode = ERR_IO_MD_DISK;

		}

		if (skip_initial_sync) {

			drbd_send_uuids_skip_initial_sync(device);

			drbd_send_uuids_skip_initial_sync(first_peer_device(device));

			_drbd_uuid_set(device, UI_BITMAP, 0);

			drbd_print_uuids(device, "cleared bitmap UUID");

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

drivers/block/drbd/drbd_receiver.c

+138 −115

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_state.c

+17 −17
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ drbd_req_state(struct drbd_device *device, union drbd_state mask, 
			goto abort;

		}



		if (drbd_send_state_req(device, mask, val)) {

		if (drbd_send_state_req(first_peer_device(device), mask, val)) {

			rv = SS_CW_FAILED_BY_PEER;

			if (f & CS_VERBOSE)

				print_st_err(device, os, ns, rv);
@@ -1293,7 +1293,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
	if ((os.conn != C_SYNC_SOURCE && os.conn != C_PAUSED_SYNC_S) &&

	    (ns.conn == C_SYNC_SOURCE || ns.conn == C_PAUSED_SYNC_S) &&

	    first_peer_device(device)->connection->agreed_pro_version >= 96 && get_ldev(device)) {

		drbd_gen_and_send_sync_uuid(device);

		drbd_gen_and_send_sync_uuid(first_peer_device(device));

		put_ldev(device);

	}
@@ -1307,8 +1307,8 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
		atomic_set(&device->rs_pending_cnt, 0);

		drbd_rs_cancel_all(device);



		drbd_send_uuids(device);

		drbd_send_state(device, ns);

		drbd_send_uuids(first_peer_device(device));

		drbd_send_state(first_peer_device(device), ns);

	}

	/* No point in queuing send_bitmap if we don't have a connection

	 * anymore, so check also the _current_ state, not only the new state
@@ -1333,7 +1333,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
					set_bit(NEW_CUR_UUID, &device->flags);

				} else {

					drbd_uuid_new_current(device);

					drbd_send_uuids(device);

					drbd_send_uuids(first_peer_device(device));

				}

			}

			put_ldev(device);
@@ -1344,7 +1344,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
		if (os.peer == R_SECONDARY && ns.peer == R_PRIMARY &&

		    device->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE) {

			drbd_uuid_new_current(device);

			drbd_send_uuids(device);

			drbd_send_uuids(first_peer_device(device));

		}

		/* D_DISKLESS Peer becomes secondary */

		if (os.peer == R_PRIMARY && ns.peer == R_SECONDARY)
@@ -1371,16 +1371,16 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
	/* Last part of the attaching process ... */

	if (ns.conn >= C_CONNECTED &&

	    os.disk == D_ATTACHING && ns.disk == D_NEGOTIATING) {

		drbd_send_sizes(device, 0, 0);  /* to start sync... */

		drbd_send_uuids(device);

		drbd_send_state(device, ns);

		drbd_send_sizes(first_peer_device(device), 0, 0);  /* to start sync... */

		drbd_send_uuids(first_peer_device(device));

		drbd_send_state(first_peer_device(device), ns);

	}



	/* We want to pause/continue resync, tell peer. */

	if (ns.conn >= C_CONNECTED &&

	     ((os.aftr_isp != ns.aftr_isp) ||

	      (os.user_isp != ns.user_isp)))

		drbd_send_state(device, ns);

		drbd_send_state(first_peer_device(device), ns);



	/* In case one of the isp bits got set, suspend other devices. */

	if ((!os.aftr_isp && !os.peer_isp && !os.user_isp) &&
@@ -1390,10 +1390,10 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
	/* Make sure the peer gets informed about eventual state

	   changes (ISP bits) while we were in WFReportParams. */

	if (os.conn == C_WF_REPORT_PARAMS && ns.conn >= C_CONNECTED)

		drbd_send_state(device, ns);

		drbd_send_state(first_peer_device(device), ns);



	if (os.conn != C_AHEAD && ns.conn == C_AHEAD)

		drbd_send_state(device, ns);

		drbd_send_state(first_peer_device(device), ns);



	/* We are in the progress to start a full sync... */

	if ((os.conn != C_STARTING_SYNC_T && ns.conn == C_STARTING_SYNC_T) ||
@@ -1447,7 +1447,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
					drbd_disk_str(device->state.disk));



			if (ns.conn >= C_CONNECTED)

				drbd_send_state(device, ns);

				drbd_send_state(first_peer_device(device), ns);



			drbd_rs_cancel_all(device);
@@ -1471,7 +1471,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
				 drbd_disk_str(device->state.disk));



		if (ns.conn >= C_CONNECTED)

			drbd_send_state(device, ns);

			drbd_send_state(first_peer_device(device), ns);

		/* corresponding get_ldev in __drbd_set_state

		 * this may finally trigger drbd_ldev_destroy. */

		put_ldev(device);
@@ -1479,7 +1479,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 


	/* Notify peer that I had a local IO error, and did not detached.. */

	if (os.disk == D_UP_TO_DATE && ns.disk == D_INCONSISTENT && ns.conn >= C_CONNECTED)

		drbd_send_state(device, ns);

		drbd_send_state(first_peer_device(device), ns);



	/* Disks got bigger while they were detached */

	if (ns.disk > D_NEGOTIATING && ns.pdsk > D_NEGOTIATING &&
@@ -1497,14 +1497,14 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, 
	/* sync target done with resync.  Explicitly notify peer, even though

	 * it should (at least for non-empty resyncs) already know itself. */

	if (os.disk < D_UP_TO_DATE && os.conn >= C_SYNC_SOURCE && ns.conn == C_CONNECTED)

		drbd_send_state(device, ns);

		drbd_send_state(first_peer_device(device), ns);



	/* Verify finished, or reached stop sector.  Peer did not know about

	 * the stop sector, and we may even have changed the stop sector during

	 * verify to interrupt/stop early.  Send the new state. */

	if (os.conn == C_VERIFY_S && ns.conn == C_CONNECTED

	&& verify_can_do_stop_sector(device))

		drbd_send_state(device, ns);

		drbd_send_state(first_peer_device(device), ns);



	/* This triggers bitmap writeout of potentially still unwritten pages

	 * if the resync finished cleanly, or aborted because of peer disk

CRA Git | Maintained and supported by SUSTech CRA and CCSE