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

Commit e89b591c authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Implemented flags for the resize packet 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 02d9a94b

drivers/block/drbd/drbd_int.h

+8 −6
Original line number Diff line number Diff line
@@ -481,7 +481,8 @@ struct p_sizes { 
	u64	    u_size;  /* user requested size */

	u64	    c_size;  /* current exported size */

	u32	    max_segment_size;  /* Maximal size of a BIO */

	u32	    queue_order_type;

	u16	    queue_order_type;  /* not yet implemented in DRBD*/

	u16	    dds_flags; /* use enum dds_flags here. */

} __packed;



struct p_state {
@@ -1081,6 +1082,11 @@ enum chg_state_flags { 
	CS_ORDERED      = CS_WAIT_COMPLETE + CS_SERIALIZE,

};



enum dds_flags {

	DDSF_FORCED    = 1,

	DDSF_NO_RESYNC = 2, /* Do not run a resync for the new space */

};



extern void drbd_init_set_defaults(struct drbd_conf *mdev);

extern int drbd_change_state(struct drbd_conf *mdev, enum chg_state_flags f,

			union drbd_state mask, union drbd_state val);
@@ -1113,7 +1119,7 @@ extern int drbd_send_protocol(struct drbd_conf *mdev); 
extern int drbd_send_uuids(struct drbd_conf *mdev);

extern int drbd_send_uuids_skip_initial_sync(struct drbd_conf *mdev);

extern int drbd_send_sync_uuid(struct drbd_conf *mdev, u64 val);

extern int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply);

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

extern int _drbd_send_state(struct drbd_conf *mdev);

extern int drbd_send_state(struct drbd_conf *mdev);

extern int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock,
@@ -1382,10 +1388,6 @@ extern void drbd_suspend_io(struct drbd_conf *mdev); 
extern void drbd_resume_io(struct drbd_conf *mdev);

extern char *ppsize(char *buf, unsigned long long size);

extern sector_t drbd_new_dev_size(struct drbd_conf *, struct drbd_backing_dev *, int);

enum dds_flags {

	DDSF_FORCED    = 1,

	DDSF_NO_RESYNC = 2, /* Do not run a resync for the new space */

};

enum determine_dev_size { dev_size_error = -1, unchanged = 0, shrunk = 1, grew = 2 };

extern enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *, enum dds_flags) __must_hold(local);

extern void resync_after_online_grow(struct drbd_conf *);

drivers/block/drbd/drbd_main.c

+4 −4
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, 
	    os.disk == D_ATTACHING && ns.disk == D_NEGOTIATING) {

		kfree(mdev->p_uuid); /* We expect to receive up-to-date UUIDs soon. */

		mdev->p_uuid = NULL; /* ...to not use the old ones in the mean time */

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

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

		drbd_send_uuids(mdev);

		drbd_send_state(mdev);

	}
@@ -1763,7 +1763,7 @@ int drbd_send_sync_uuid(struct drbd_conf *mdev, u64 val) 
			     (struct p_header *)&p, sizeof(p));

}



int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply)

int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply, enum dds_flags flags)

{

	struct p_sizes p;

	sector_t d_size, u_size;
@@ -1775,7 +1775,6 @@ int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply) 
		d_size = drbd_get_max_capacity(mdev->ldev);

		u_size = mdev->ldev->dc.disk_size;

		q_order_type = drbd_queue_order_type(mdev);

		p.queue_order_type = cpu_to_be32(drbd_queue_order_type(mdev));

		put_ldev(mdev);

	} else {

		d_size = 0;
@@ -1787,7 +1786,8 @@ int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply) 
	p.u_size = cpu_to_be64(u_size);

	p.c_size = cpu_to_be64(trigger_reply ? 0 : drbd_get_capacity(mdev->this_bdev));

	p.max_segment_size = cpu_to_be32(queue_max_segment_size(mdev->rq_queue));

	p.queue_order_type = cpu_to_be32(q_order_type);

	p.queue_order_type = cpu_to_be16(q_order_type);

	p.dds_flags = cpu_to_be16(flags);



	ok = drbd_send_cmd(mdev, USE_DATA_SOCKET, P_SIZES,

			   (struct p_header *)&p, sizeof(p));

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -1521,7 +1521,7 @@ static int drbd_nl_resize(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, 
			set_bit(RESIZE_PENDING, &mdev->flags);



		drbd_send_uuids(mdev);

		drbd_send_sizes(mdev, 1);

		drbd_send_sizes(mdev, 1, 0);

	}



 fail:

drivers/block/drbd/drbd_receiver.c

+12 −7
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ static int drbd_connect(struct drbd_conf *mdev) 
	if (!drbd_send_protocol(mdev))

		return -1;

	drbd_send_sync_param(mdev, &mdev->sync_conf);

	drbd_send_sizes(mdev, 0);

	drbd_send_sizes(mdev, 0, 0);

	drbd_send_uuids(mdev);

	drbd_send_state(mdev);

	clear_bit(USE_DEGR_WFC_T, &mdev->flags);
@@ -2866,6 +2866,7 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h) 
	unsigned int max_seg_s;

	sector_t p_size, p_usize, my_usize;

	int ldsc = 0; /* local disk size changed */

	enum dds_flags ddsf;



	ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;

	if (drbd_recv(mdev, h->payload, h->length) != h->length)
@@ -2921,8 +2922,9 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h) 
	}

#undef min_not_zero



	ddsf = be16_to_cpu(p->dds_flags);

	if (get_ldev(mdev)) {

	  dd = drbd_determin_dev_size(mdev, 0);

		dd = drbd_determin_dev_size(mdev, ddsf);

		put_ldev(mdev);

		if (dd == dev_size_error)

			return FALSE;
@@ -2942,7 +2944,7 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h) 
		if (max_seg_s != queue_max_segment_size(mdev->rq_queue))

			drbd_setup_queue_param(mdev, max_seg_s);



		drbd_setup_order_type(mdev, be32_to_cpu(p->queue_order_type));

		drbd_setup_order_type(mdev, be16_to_cpu(p->queue_order_type));

		put_ldev(mdev);

	}
@@ -2951,14 +2953,17 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h) 
		    drbd_get_capacity(mdev->this_bdev) || ldsc) {

			/* we have different sizes, probably peer

			 * needs to know my new size... */

			drbd_send_sizes(mdev, 0);

			drbd_send_sizes(mdev, 0, ddsf);

		}

		if (test_and_clear_bit(RESIZE_PENDING, &mdev->flags) ||

		    (dd == grew && mdev->state.conn == C_CONNECTED)) {

			if (mdev->state.pdsk >= D_INCONSISTENT &&

			    mdev->state.disk >= D_INCONSISTENT)

				resync_after_online_grow(mdev);

			    mdev->state.disk >= D_INCONSISTENT) {

				if (ddsf & DDSF_NO_RESYNC)

					dev_info(DEV, "Resync of new storage suppressed with --assume-clean\n");

				else

					resync_after_online_grow(mdev);

			} else

				set_bit(RESYNC_AFTER_NEG, &mdev->flags);

		}

	}