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

dm zoned: return NULL if dmz_get_zone_for_reclaim() fails to find a zone



The only case where dmz_get_zone_for_reclaim() cannot return a zone is
if the respective lists are empty. So we should just return a simple
NULL value here as we really don't have an error code which would make
sense.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 42c689f6
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1845,7 +1845,7 @@ static struct dm_zone *dmz_get_rnd_zone_for_reclaim(struct dmz_metadata *zmd)
			return dzone;
	}

	return ERR_PTR(-EBUSY);
	return NULL;
}

/*
@@ -1865,7 +1865,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)
			return zone;
	}

	return ERR_PTR(-EBUSY);
	return NULL;
}

/*
+2 −2
Original line number Diff line number Diff line
@@ -352,8 +352,8 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)

	/* Get a data zone */
	dzone = dmz_get_zone_for_reclaim(zmd);
	if (IS_ERR(dzone))
		return PTR_ERR(dzone);
	if (!dzone)
		return -EBUSY;

	start = jiffies;
	if (dmz_is_rnd(dzone)) {