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

Commit 32a59639 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Greg Kroah-Hartman
Browse files

rbd: move rbd_dev_refresh() definition 



commit 0b035401c57021fc6c300272cbb1c5a889d4fe45 upstream.

Move rbd_dev_refresh() definition further down to avoid having to
move struct parent_image_info definition in the next commit.  This
spares some forward declarations too.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarDongsheng Yang <dongsheng.yang@easystack.cn>
[idryomov@gmail.com: backport to 5.4: drop rbd_is_snap() assert,
 preserve rbd_exists_validate() call]
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ff10b1fa

drivers/block/rbd.c

+37 −39
Original line number Diff line number Diff line
@@ -627,8 +627,6 @@ static void rbd_dev_remove_parent(struct rbd_device *rbd_dev); 


static int rbd_dev_refresh(struct rbd_device *rbd_dev);

static int rbd_dev_v2_header_onetime(struct rbd_device *rbd_dev);

static int rbd_dev_header_info(struct rbd_device *rbd_dev);

static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev);

static const char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev,

					u64 snap_id);

static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,
@@ -5075,43 +5073,6 @@ static void rbd_dev_update_size(struct rbd_device *rbd_dev) 
	}

}



static int rbd_dev_refresh(struct rbd_device *rbd_dev)

{

	u64 mapping_size;

	int ret;



	down_write(&rbd_dev->header_rwsem);

	mapping_size = rbd_dev->mapping.size;



	ret = rbd_dev_header_info(rbd_dev);

	if (ret)

		goto out;



	/*

	 * If there is a parent, see if it has disappeared due to the

	 * mapped image getting flattened.

	 */

	if (rbd_dev->parent) {

		ret = rbd_dev_v2_parent_info(rbd_dev);

		if (ret)

			goto out;

	}



	if (rbd_dev->spec->snap_id == CEPH_NOSNAP) {

		rbd_dev->mapping.size = rbd_dev->header.image_size;

	} else {

		/* validate mapped snapshot's EXISTS flag */

		rbd_exists_validate(rbd_dev);

	}



out:

	up_write(&rbd_dev->header_rwsem);

	if (!ret && mapping_size != rbd_dev->mapping.size)

		rbd_dev_update_size(rbd_dev);



	return ret;

}



static int rbd_init_request(struct blk_mq_tag_set *set, struct request *rq,

		unsigned int hctx_idx, unsigned int numa_node)

{
@@ -7061,6 +7022,43 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth) 
	return ret;

}



static int rbd_dev_refresh(struct rbd_device *rbd_dev)

{

	u64 mapping_size;

	int ret;



	down_write(&rbd_dev->header_rwsem);

	mapping_size = rbd_dev->mapping.size;



	ret = rbd_dev_header_info(rbd_dev);

	if (ret)

		goto out;



	/*

	 * If there is a parent, see if it has disappeared due to the

	 * mapped image getting flattened.

	 */

	if (rbd_dev->parent) {

		ret = rbd_dev_v2_parent_info(rbd_dev);

		if (ret)

			goto out;

	}



	if (rbd_dev->spec->snap_id == CEPH_NOSNAP) {

		rbd_dev->mapping.size = rbd_dev->header.image_size;

	} else {

		/* validate mapped snapshot's EXISTS flag */

		rbd_exists_validate(rbd_dev);

	}



out:

	up_write(&rbd_dev->header_rwsem);

	if (!ret && mapping_size != rbd_dev->mapping.size)

		rbd_dev_update_size(rbd_dev);



	return ret;

}



static ssize_t do_rbd_add(struct bus_type *bus,

			  const char *buf,

			  size_t count)