Commit d1727d55 authored by Joe Perches's avatar Joe Perches Committed by Namjae Jeon
Browse files

exfat: Use a more common logging style 



Remove the direct use of KERN_<LEVEL> in functions by creating
separate exfat_<level> macros.

Miscellanea:

o Remove several unnecessary terminating newlines in formats
o Realign arguments and fit to 80 columns where appropriate

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
parent 197298a6

fs/exfat/balloc.c

+3 −5
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ static int exfat_allocate_bitmap(struct super_block *sb, 
	need_map_size = ((EXFAT_DATA_CLUSTER_COUNT(sbi) - 1) / BITS_PER_BYTE)

		+ 1;

	if (need_map_size != map_size) {

		exfat_msg(sb, KERN_ERR,

				"bogus allocation bitmap size(need : %u, cur : %lld)",

		exfat_err(sb, "bogus allocation bitmap size(need : %u, cur : %lld)",

			  need_map_size, map_size);

		/*

		 * Only allowed when bogus allocation
@@ -192,8 +191,7 @@ void exfat_clear_bitmap(struct inode *inode, unsigned int clu) 
			(1 << sbi->sect_per_clus_bits), GFP_NOFS, 0);



		if (ret_discard == -EOPNOTSUPP) {

			exfat_msg(sb, KERN_ERR,

				"discard not supported by device, disabling");

			exfat_err(sb, "discard not supported by device, disabling");

			opts->discard = 0;

		}

	}

fs/exfat/dir.c

+4 −5
Original line number Diff line number Diff line
@@ -720,8 +720,7 @@ static int exfat_dir_readahead(struct super_block *sb, sector_t sec) 
		return 0;



	if (sec < sbi->data_start_sector) {

		exfat_msg(sb, KERN_ERR,

			"requested sector is invalid(sect:%llu, root:%llu)",

		exfat_err(sb, "requested sector is invalid(sect:%llu, root:%llu)",

			  (unsigned long long)sec, sbi->data_start_sector);

		return -EIO;

	}
@@ -750,7 +749,7 @@ struct exfat_dentry *exfat_get_dentry(struct super_block *sb, 
	sector_t sec;



	if (p_dir->dir == DIR_DELETED) {

		exfat_msg(sb, KERN_ERR, "abnormal access to deleted dentry\n");

		exfat_err(sb, "abnormal access to deleted dentry");

		return NULL;

	}
@@ -853,7 +852,7 @@ struct exfat_entry_set_cache *exfat_get_dentry_set(struct super_block *sb, 
	struct buffer_head *bh;



	if (p_dir->dir == DIR_DELETED) {

		exfat_msg(sb, KERN_ERR, "access to deleted dentry\n");

		exfat_err(sb, "access to deleted dentry");

		return NULL;

	}

fs/exfat/exfat_fs.h

+7 −0
Original line number Diff line number Diff line
@@ -505,6 +505,13 @@ void __exfat_fs_error(struct super_block *sb, int report, const char *fmt, ...) 
		fmt, ## args)

void exfat_msg(struct super_block *sb, const char *lv, const char *fmt, ...)

		__printf(3, 4) __cold;

#define exfat_err(sb, fmt, ...)						\

	exfat_msg(sb, KERN_ERR, fmt, ##__VA_ARGS__)

#define exfat_warn(sb, fmt, ...)					\

	exfat_msg(sb, KERN_WARNING, fmt, ##__VA_ARGS__)

#define exfat_info(sb, fmt, ...)					\

	exfat_msg(sb, KERN_INFO, fmt, ##__VA_ARGS__)



void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,

		u8 tz, __le16 time, __le16 date, u8 time_ms);

void exfat_truncate_atime(struct timespec64 *ts);

fs/exfat/fatent.c

+5 −8
Original line number Diff line number Diff line
@@ -170,8 +170,7 @@ int exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain) 


	/* check cluster validation */

	if (p_chain->dir < 2 && p_chain->dir >= sbi->num_clusters) {

		exfat_msg(sb, KERN_ERR, "invalid start cluster (%u)",

				p_chain->dir);

		exfat_err(sb, "invalid start cluster (%u)", p_chain->dir);

		return -EIO;

	}
@@ -305,8 +304,7 @@ int exfat_zeroed_cluster(struct inode *dir, unsigned int clu) 
	return 0;



release_bhs:

	exfat_msg(sb, KERN_ERR, "failed zeroed sect %llu\n",

		(unsigned long long)blknr);

	exfat_err(sb, "failed zeroed sect %llu\n", (unsigned long long)blknr);

	for (i = 0; i < n; i++)

		bforget(bhs[i]);

	return err;
@@ -337,8 +335,7 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 
	/* find new cluster */

	if (hint_clu == EXFAT_EOF_CLUSTER) {

		if (sbi->clu_srch_ptr < EXFAT_FIRST_CLUSTER) {

			exfat_msg(sb, KERN_ERR,

				"sbi->clu_srch_ptr is invalid (%u)\n",

			exfat_err(sb, "sbi->clu_srch_ptr is invalid (%u)\n",

				  sbi->clu_srch_ptr);

			sbi->clu_srch_ptr = EXFAT_FIRST_CLUSTER;

		}
@@ -350,7 +347,7 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 


	/* check cluster validation */

	if (hint_clu < EXFAT_FIRST_CLUSTER && hint_clu >= sbi->num_clusters) {

		exfat_msg(sb, KERN_ERR, "hint_cluster is invalid (%u)\n",

		exfat_err(sb, "hint_cluster is invalid (%u)",

			hint_clu);

		hint_clu = EXFAT_FIRST_CLUSTER;

		if (p_chain->flags == ALLOC_NO_FAT_CHAIN) {

fs/exfat/misc.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ void __exfat_fs_error(struct super_block *sb, int report, const char *fmt, ...) 
		va_start(args, fmt);

		vaf.fmt = fmt;

		vaf.va = &args;

		exfat_msg(sb, KERN_ERR, "error, %pV\n", &vaf);

		exfat_err(sb, "error, %pV", &vaf);

		va_end(args);

	}
@@ -41,7 +41,7 @@ void __exfat_fs_error(struct super_block *sb, int report, const char *fmt, ...) 
			sb->s_id);

	} else if (opts->errors == EXFAT_ERRORS_RO && !sb_rdonly(sb)) {

		sb->s_flags |= SB_RDONLY;

		exfat_msg(sb, KERN_ERR, "Filesystem has been set read-only");

		exfat_err(sb, "Filesystem has been set read-only");

	}

}