Skip to content

Commit 3571fc2

Browse files
Dr. David Alan GilbertMikulas Patocka
authored andcommitted
dm: zoned: Remove unused functions
dmz_resume_metadata() is unused since it was added in commit 3b1a94c ("dm zoned: drive-managed zoned block device target") dmz_zone_nr_blocks_shift is unused since it was added in commit 3682056 ("dm zoned: move fields from struct dmz_dev to dmz_metadata") Remove them. Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
1 parent ad92661 commit 3571fc2

File tree

2 files changed

+0
-52
lines changed

2 files changed

+0
-52
lines changed

drivers/md/dm-zoned-metadata.c

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,6 @@ unsigned int dmz_zone_nr_blocks(struct dmz_metadata *zmd)
245245
return zmd->zone_nr_blocks;
246246
}
247247

248-
unsigned int dmz_zone_nr_blocks_shift(struct dmz_metadata *zmd)
249-
{
250-
return zmd->zone_nr_blocks_shift;
251-
}
252-
253248
unsigned int dmz_zone_nr_sectors(struct dmz_metadata *zmd)
254249
{
255250
return zmd->zone_nr_sectors;
@@ -3005,48 +3000,3 @@ void dmz_dtr_metadata(struct dmz_metadata *zmd)
30053000
dmz_cleanup_metadata(zmd);
30063001
kfree(zmd);
30073002
}
3008-
3009-
/*
3010-
* Check zone information on resume.
3011-
*/
3012-
int dmz_resume_metadata(struct dmz_metadata *zmd)
3013-
{
3014-
struct dm_zone *zone;
3015-
sector_t wp_block;
3016-
unsigned int i;
3017-
int ret;
3018-
3019-
/* Check zones */
3020-
for (i = 0; i < zmd->nr_zones; i++) {
3021-
zone = dmz_get(zmd, i);
3022-
if (!zone) {
3023-
dmz_zmd_err(zmd, "Unable to get zone %u", i);
3024-
return -EIO;
3025-
}
3026-
wp_block = zone->wp_block;
3027-
3028-
ret = dmz_update_zone(zmd, zone);
3029-
if (ret) {
3030-
dmz_zmd_err(zmd, "Broken zone %u", i);
3031-
return ret;
3032-
}
3033-
3034-
if (dmz_is_offline(zone)) {
3035-
dmz_zmd_warn(zmd, "Zone %u is offline", i);
3036-
continue;
3037-
}
3038-
3039-
/* Check write pointer */
3040-
if (!dmz_is_seq(zone))
3041-
zone->wp_block = 0;
3042-
else if (zone->wp_block != wp_block) {
3043-
dmz_zmd_err(zmd, "Zone %u: Invalid wp (%llu / %llu)",
3044-
i, (u64)zone->wp_block, (u64)wp_block);
3045-
zone->wp_block = wp_block;
3046-
dmz_invalidate_blocks(zmd, zone, zone->wp_block,
3047-
zmd->zone_nr_blocks - zone->wp_block);
3048-
}
3049-
}
3050-
3051-
return 0;
3052-
}

drivers/md/dm-zoned.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ enum {
192192
int dmz_ctr_metadata(struct dmz_dev *dev, int num_dev,
193193
struct dmz_metadata **zmd, const char *devname);
194194
void dmz_dtr_metadata(struct dmz_metadata *zmd);
195-
int dmz_resume_metadata(struct dmz_metadata *zmd);
196195

197196
void dmz_lock_map(struct dmz_metadata *zmd);
198197
void dmz_unlock_map(struct dmz_metadata *zmd);
@@ -230,7 +229,6 @@ unsigned int dmz_nr_unmap_rnd_zones(struct dmz_metadata *zmd, int idx);
230229
unsigned int dmz_nr_seq_zones(struct dmz_metadata *zmd, int idx);
231230
unsigned int dmz_nr_unmap_seq_zones(struct dmz_metadata *zmd, int idx);
232231
unsigned int dmz_zone_nr_blocks(struct dmz_metadata *zmd);
233-
unsigned int dmz_zone_nr_blocks_shift(struct dmz_metadata *zmd);
234232
unsigned int dmz_zone_nr_sectors(struct dmz_metadata *zmd);
235233
unsigned int dmz_zone_nr_sectors_shift(struct dmz_metadata *zmd);
236234

0 commit comments

Comments
 (0)