redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

[ Upstream commit 489dc0f06a ]

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: Hannes Reinecke <hare@suse.de>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
Hannes Reinecke 2020-05-19 10:14:19 +02:00 committed by Greg Kroah-Hartman
parent 96cd8d249a
commit f04479f8d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/dm-zoned-metadata.c
View File

@ -1589,7 +1589,7 @@ static struct dm_zone *dmz_get_rnd_zone_for_reclaim(struct dmz_metadata *zmd)
return dzone; return dzone;
} }
return ERR_PTR(-EBUSY); return NULL;
} }
/* /*
@ -1609,7 +1609,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)
return zone; return zone;
} }
return ERR_PTR(-EBUSY); return NULL;
} }
/* /*

4
drivers/md/dm-zoned-reclaim.c
View File

@ -349,8 +349,8 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)
/* Get a data zone */ /* Get a data zone */
dzone = dmz_get_zone_for_reclaim(zmd); dzone = dmz_get_zone_for_reclaim(zmd);
if (IS_ERR(dzone)) if (!dzone)
return PTR_ERR(dzone); return -EBUSY;
start = jiffies; start = jiffies;