Commit bda2f981 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by sanglipeng
Browse files

rbd: move rbd_dev_refresh() definition 

stable inclusion
from stable-v5.10.198
commit 7c4f11d73b2425420c0a6e2d5d8a37eee36dad17
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I987V5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7c4f11d73b2425420c0a6e2d5d8a37eee36dad17



--------------------------------

commit 0b035401 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.10-6.1: context]
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 606666f0

drivers/block/rbd.c

+33 −35
Original line number Diff line number Diff line
@@ -633,8 +633,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,
@@ -4989,39 +4987,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;

	}



	rbd_assert(!rbd_is_snap(rbd_dev));

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



out:

	up_write(&rbd_dev->header_rwsem);

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

		rbd_dev_update_size(rbd_dev);



	return ret;

}



static const struct blk_mq_ops rbd_mq_ops = {

	.queue_rq	= rbd_queue_rq,

};
@@ -7115,6 +7080,39 @@ 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;

	}



	rbd_assert(!rbd_is_snap(rbd_dev));

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



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)