Commit d0e21ce4 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Mike Snitzer
Browse files

dm zoned: Introduce dmz_dev_is_dying() and dmz_check_dev() 



Introduce accessors dmz_dev_is_dying() and dmz_check_dev() to
avoid having to reference the devices directly.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarBob Liu <bob.liu@oracle.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 2234e732

drivers/md/dm-zoned-metadata.c

+12 −2
Original line number Diff line number Diff line
@@ -267,6 +267,16 @@ const char *dmz_metadata_label(struct dmz_metadata *zmd) 
	return (const char *)zmd->devname;

}



bool dmz_check_dev(struct dmz_metadata *zmd)

{

	return dmz_check_bdev(&zmd->dev[0]);

}



bool dmz_dev_is_dying(struct dmz_metadata *zmd)

{

	return dmz_bdev_is_dying(&zmd->dev[0]);

}



/*

 * Lock/unlock mapping table.

 * The map lock also protects all the zone lists.
@@ -1719,7 +1729,7 @@ again: 
		/* Allocate a random zone */

		dzone = dmz_alloc_zone(zmd, DMZ_ALLOC_RND);

		if (!dzone) {

			if (dmz_bdev_is_dying(zmd->dev)) {

			if (dmz_dev_is_dying(zmd)) {

				dzone = ERR_PTR(-EIO);

				goto out;

			}
@@ -1820,7 +1830,7 @@ again: 
	/* Allocate a random zone */

	bzone = dmz_alloc_zone(zmd, DMZ_ALLOC_RND);

	if (!bzone) {

		if (dmz_bdev_is_dying(zmd->dev)) {

		if (dmz_dev_is_dying(zmd)) {

			bzone = ERR_PTR(-EIO);

			goto out;

		}

drivers/md/dm-zoned-reclaim.c

+2 −2
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static void dmz_reclaim_work(struct work_struct *work) 
	unsigned int p_unmap_rnd;

	int ret;



	if (dmz_bdev_is_dying(zrc->dev))

	if (dmz_dev_is_dying(zmd))

		return;



	if (!dmz_should_reclaim(zrc)) {
@@ -490,7 +490,7 @@ static void dmz_reclaim_work(struct work_struct *work) 
	if (ret) {

		DMDEBUG("(%s): Reclaim error %d\n",

			dmz_metadata_label(zmd), ret);

		if (!dmz_check_bdev(zrc->dev))

		if (!dmz_check_dev(zmd))

			return;

	}

drivers/md/dm-zoned-target.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static int dmz_map(struct dm_target *ti, struct bio *bio) 
	sector_t chunk_sector;

	int ret;



	if (dmz_bdev_is_dying(dmz->dev))

	if (dmz_dev_is_dying(zmd))

		return DM_MAPIO_KILL;



	DMDEBUG("(%s): BIO op %d sector %llu + %u => chunk %llu, block %llu, %u blocks",

drivers/md/dm-zoned.h

+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,9 @@ sector_t dmz_start_sect(struct dmz_metadata *zmd, struct dm_zone *zone); 
sector_t dmz_start_block(struct dmz_metadata *zmd, struct dm_zone *zone);

unsigned int dmz_nr_chunks(struct dmz_metadata *zmd);



bool dmz_check_dev(struct dmz_metadata *zmd);

bool dmz_dev_is_dying(struct dmz_metadata *zmd);



#define DMZ_ALLOC_RND		0x01

#define DMZ_ALLOC_RECLAIM	0x02

CRA Git | Maintained and supported by SUSTech CRA and CCSE