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

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

drbd: made determin_dev_size's parameter an flag enum 



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

drivers/block/drbd/drbd_int.h

+5 −1
Original line number Diff line number Diff line
@@ -1382,8 +1382,12 @@ 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 *, int force) __must_hold(local);

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 *);

extern void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int) __must_hold(local);

extern int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role,

drivers/block/drbd/drbd_nl.c

+3 −3
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ void drbd_resume_io(struct drbd_conf *mdev) 
 * Returns 0 on success, negative return values indicate errors.

 * You should call drbd_md_sync() after calling this function.

 */

enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *mdev, int force) __must_hold(local)

enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *mdev, enum dds_flags flags) __must_hold(local)

{

	sector_t prev_first_sect, prev_size; /* previous meta location */

	sector_t la_size;
@@ -541,7 +541,7 @@ enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *mdev, int force 
	/* TODO: should only be some assert here, not (re)init... */

	drbd_md_set_sector_offsets(mdev, mdev->ldev);



	size = drbd_new_dev_size(mdev, mdev->ldev, force);

	size = drbd_new_dev_size(mdev, mdev->ldev, flags & DDSF_FORCED);



	if (drbd_get_capacity(mdev->this_bdev) != size ||

	    drbd_bm_capacity(mdev) != size) {
@@ -1508,7 +1508,7 @@ static int drbd_nl_resize(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, 
	}



	mdev->ldev->dc.disk_size = (sector_t)rs.resize_size;

	dd = drbd_determin_dev_size(mdev, rs.resize_force);

	dd = drbd_determin_dev_size(mdev, rs.resize_force ? DDSF_FORCED : 0);

	drbd_md_sync(mdev);

	put_ldev(mdev);

	if (dd == dev_size_error) {