Commit a78b34b8 authored by Valdis Kletnieks's avatar Valdis Kletnieks Committed by Greg Kroah-Hartman
Browse files

staging: exfat: Clean up the namespace pollution part 5 



Some more functions that can be moved and made static

Signed-off-by: default avatarValdis Kletnieks <Valdis.Kletnieks@vt.edu>
Link: https://lore.kernel.org/r/20191112211238.156490-10-Valdis.Kletnieks@vt.edu


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9435fa8d

drivers/staging/exfat/exfat.h

+0 −3
Original line number Diff line number Diff line
@@ -764,9 +764,6 @@ void exfat_chain_cont_cluster(struct super_block *sb, u32 chain, s32 len); 
/* allocation bitmap management functions */

s32 load_alloc_bitmap(struct super_block *sb);

void free_alloc_bitmap(struct super_block *sb);

s32 set_alloc_bitmap(struct super_block *sb, u32 clu);

s32 clr_alloc_bitmap(struct super_block *sb, u32 clu);

u32 test_alloc_bitmap(struct super_block *sb, u32 clu);

void sync_alloc_bitmap(struct super_block *sb);



/* upcase table management functions */

drivers/staging/exfat/exfat_core.c

+91 −91
Original line number Diff line number Diff line
@@ -156,6 +156,97 @@ static s32 clear_cluster(struct super_block *sb, u32 clu) 
	return ret;

}



static s32 set_alloc_bitmap(struct super_block *sb, u32 clu)

{

	int i, b;

	sector_t sector;

	struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);



	i = clu >> (p_bd->sector_size_bits + 3);

	b = clu & ((p_bd->sector_size << 3) - 1);



	sector = START_SECTOR(p_fs->map_clu) + i;



	exfat_bitmap_set((u8 *)p_fs->vol_amap[i]->b_data, b);



	return sector_write(sb, sector, p_fs->vol_amap[i], 0);

}



static s32 clr_alloc_bitmap(struct super_block *sb, u32 clu)

{

	int i, b;

	sector_t sector;

#ifdef CONFIG_EXFAT_DISCARD

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	struct exfat_mount_options *opts = &sbi->options;

	int ret;

#endif /* CONFIG_EXFAT_DISCARD */

	struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);



	i = clu >> (p_bd->sector_size_bits + 3);

	b = clu & ((p_bd->sector_size << 3) - 1);



	sector = START_SECTOR(p_fs->map_clu) + i;



	exfat_bitmap_clear((u8 *)p_fs->vol_amap[i]->b_data, b);



	return sector_write(sb, sector, p_fs->vol_amap[i], 0);



#ifdef CONFIG_EXFAT_DISCARD

	if (opts->discard) {

		ret = sb_issue_discard(sb, START_SECTOR(clu),

				       (1 << p_fs->sectors_per_clu_bits),

				       GFP_NOFS, 0);

		if (ret == -EOPNOTSUPP) {

			pr_warn("discard not supported by device, disabling");

			opts->discard = 0;

		}

	}

#endif /* CONFIG_EXFAT_DISCARD */

}



static u32 test_alloc_bitmap(struct super_block *sb, u32 clu)

{

	int i, map_i, map_b;

	u32 clu_base, clu_free;

	u8 k, clu_mask;

	struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);



	clu_base = (clu & ~(0x7)) + 2;

	clu_mask = (1 << (clu - clu_base + 2)) - 1;



	map_i = clu >> (p_bd->sector_size_bits + 3);

	map_b = (clu >> 3) & p_bd->sector_size_mask;



	for (i = 2; i < p_fs->num_clusters; i += 8) {

		k = *(((u8 *)p_fs->vol_amap[map_i]->b_data) + map_b);

		if (clu_mask > 0) {

			k |= clu_mask;

			clu_mask = 0;

		}

		if (k < 0xFF) {

			clu_free = clu_base + free_bit[k];

			if (clu_free < p_fs->num_clusters)

				return clu_free;

		}

		clu_base += 8;



		if (((++map_b) >= p_bd->sector_size) ||

		    (clu_base >= p_fs->num_clusters)) {

			if ((++map_i) >= p_fs->map_sectors) {

				clu_base = 2;

				map_i = 0;

			}

			map_b = 0;

		}

	}



	return CLUSTER_32(~0);

}



static s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,

			struct chain_t *p_chain)

{
@@ -468,97 +559,6 @@ void free_alloc_bitmap(struct super_block *sb) 
	p_fs->vol_amap = NULL;

}



s32 set_alloc_bitmap(struct super_block *sb, u32 clu)

{

	int i, b;

	sector_t sector;

	struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);



	i = clu >> (p_bd->sector_size_bits + 3);

	b = clu & ((p_bd->sector_size << 3) - 1);



	sector = START_SECTOR(p_fs->map_clu) + i;



	exfat_bitmap_set((u8 *)p_fs->vol_amap[i]->b_data, b);



	return sector_write(sb, sector, p_fs->vol_amap[i], 0);

}



s32 clr_alloc_bitmap(struct super_block *sb, u32 clu)

{

	int i, b;

	sector_t sector;

#ifdef CONFIG_EXFAT_DISCARD

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	struct exfat_mount_options *opts = &sbi->options;

	int ret;

#endif /* CONFIG_EXFAT_DISCARD */

	struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);



	i = clu >> (p_bd->sector_size_bits + 3);

	b = clu & ((p_bd->sector_size << 3) - 1);



	sector = START_SECTOR(p_fs->map_clu) + i;



	exfat_bitmap_clear((u8 *)p_fs->vol_amap[i]->b_data, b);



	return sector_write(sb, sector, p_fs->vol_amap[i], 0);



#ifdef CONFIG_EXFAT_DISCARD

	if (opts->discard) {

		ret = sb_issue_discard(sb, START_SECTOR(clu),

				       (1 << p_fs->sectors_per_clu_bits),

				       GFP_NOFS, 0);

		if (ret == -EOPNOTSUPP) {

			pr_warn("discard not supported by device, disabling");

			opts->discard = 0;

		}

	}

#endif /* CONFIG_EXFAT_DISCARD */

}



u32 test_alloc_bitmap(struct super_block *sb, u32 clu)

{

	int i, map_i, map_b;

	u32 clu_base, clu_free;

	u8 k, clu_mask;

	struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);



	clu_base = (clu & ~(0x7)) + 2;

	clu_mask = (1 << (clu - clu_base + 2)) - 1;



	map_i = clu >> (p_bd->sector_size_bits + 3);

	map_b = (clu >> 3) & p_bd->sector_size_mask;



	for (i = 2; i < p_fs->num_clusters; i += 8) {

		k = *(((u8 *)p_fs->vol_amap[map_i]->b_data) + map_b);

		if (clu_mask > 0) {

			k |= clu_mask;

			clu_mask = 0;

		}

		if (k < 0xFF) {

			clu_free = clu_base + free_bit[k];

			if (clu_free < p_fs->num_clusters)

				return clu_free;

		}

		clu_base += 8;



		if (((++map_b) >= p_bd->sector_size) ||

		    (clu_base >= p_fs->num_clusters)) {

			if ((++map_i) >= p_fs->map_sectors) {

				clu_base = 2;

				map_i = 0;

			}

			map_b = 0;

		}

	}



	return CLUSTER_32(~0);

}



void sync_alloc_bitmap(struct super_block *sb)

{

	int i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE