Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c8f85e9 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

nilfs2: use a more common logging style 



[ Upstream commit a1d0747a393a079631130d61faa2a61027d1c789 ]

Add macros for nilfs_<level>(sb, fmt, ...) and convert the uses of
'nilfs_msg(sb, KERN_<LEVEL>, ...)' to 'nilfs_<level>(sb, ...)' so nilfs2
uses a logging style more like the typical kernel logging style.

Miscellanea:

o Realign arguments for these uses

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/1595860111-3920-4-git-send-email-konishi.ryusuke@gmail.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Stable-dep-of: 269cdf353b5b ("nilfs2: prevent kernel bug at submit_bh_wbc()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b6718969

fs/nilfs2/alloc.c

+19 −19
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode, 
	lock = nilfs_mdt_bgl_lock(inode, group);



	if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))

		nilfs_msg(inode->i_sb, KERN_WARNING,

		nilfs_warn(inode->i_sb,

			   "%s (ino=%lu): entry number %llu already freed",

			   __func__, inode->i_ino,

			   (unsigned long long)req->pr_entry_nr);
@@ -655,7 +655,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode, 
	lock = nilfs_mdt_bgl_lock(inode, group);



	if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))

		nilfs_msg(inode->i_sb, KERN_WARNING,

		nilfs_warn(inode->i_sb,

			   "%s (ino=%lu): entry number %llu already freed",

			   __func__, inode->i_ino,

			   (unsigned long long)req->pr_entry_nr);
@@ -764,7 +764,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
		do {

			if (!nilfs_clear_bit_atomic(lock, group_offset,

						    bitmap)) {

				nilfs_msg(inode->i_sb, KERN_WARNING,

				nilfs_warn(inode->i_sb,

					   "%s (ino=%lu): entry number %llu already freed",

					   __func__, inode->i_ino,

					   (unsigned long long)entry_nrs[j]);
@@ -809,7 +809,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
			ret = nilfs_palloc_delete_entry_block(inode,

							      last_nrs[k]);

			if (ret && ret != -ENOENT)

				nilfs_msg(inode->i_sb, KERN_WARNING,

				nilfs_warn(inode->i_sb,

					   "error %d deleting block that object (entry=%llu, ino=%lu) belongs to",

					   ret, (unsigned long long)last_nrs[k],

					   inode->i_ino);
@@ -827,7 +827,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
		if (nfree == nilfs_palloc_entries_per_group(inode)) {

			ret = nilfs_palloc_delete_bitmap_block(inode, group);

			if (ret && ret != -ENOENT)

				nilfs_msg(inode->i_sb, KERN_WARNING,

				nilfs_warn(inode->i_sb,

					   "error %d deleting bitmap block of group=%lu, ino=%lu",

					   ret, group, inode->i_ino);

		}

fs/nilfs2/btree.c

+21 −21
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int nilfs_btree_node_broken(const struct nilfs_btree_node *node, 
		     (flags & NILFS_BTREE_NODE_ROOT) ||

		     nchildren < 0 ||

		     nchildren > NILFS_BTREE_NODE_NCHILDREN_MAX(size))) {

		nilfs_msg(inode->i_sb, KERN_CRIT,

		nilfs_crit(inode->i_sb,

			   "bad btree node (ino=%lu, blocknr=%llu): level = %d, flags = 0x%x, nchildren = %d",

			   inode->i_ino, (unsigned long long)blocknr, level,

			   flags, nchildren);
@@ -382,7 +382,7 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node, 
		     level >= NILFS_BTREE_LEVEL_MAX ||

		     nchildren < 0 ||

		     nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX)) {

		nilfs_msg(inode->i_sb, KERN_CRIT,

		nilfs_crit(inode->i_sb,

			   "bad btree root (ino=%lu): level = %d, flags = 0x%x, nchildren = %d",

			   inode->i_ino, level, flags, nchildren);

		ret = 1;
@@ -451,7 +451,7 @@ static int nilfs_btree_bad_node(const struct nilfs_bmap *btree, 
{

	if (unlikely(nilfs_btree_node_get_level(node) != level)) {

		dump_stack();

		nilfs_msg(btree->b_inode->i_sb, KERN_CRIT,

		nilfs_crit(btree->b_inode->i_sb,

			   "btree level mismatch (ino=%lu): %d != %d",

			   btree->b_inode->i_ino,

			   nilfs_btree_node_get_level(node), level);
@@ -519,7 +519,7 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *btree, __u64 ptr, 


 out_no_wait:

	if (!buffer_uptodate(bh)) {

		nilfs_msg(btree->b_inode->i_sb, KERN_ERR,

		nilfs_err(btree->b_inode->i_sb,

			  "I/O error reading b-tree node block (ino=%lu, blocknr=%llu)",

			  btree->b_inode->i_ino, (unsigned long long)ptr);

		brelse(bh);
@@ -2094,7 +2094,7 @@ static int nilfs_btree_propagate(struct nilfs_bmap *btree, 
	ret = nilfs_btree_do_lookup(btree, path, key, NULL, level + 1, 0);

	if (ret < 0) {

		if (unlikely(ret == -ENOENT))

			nilfs_msg(btree->b_inode->i_sb, KERN_CRIT,

			nilfs_crit(btree->b_inode->i_sb,

				   "writing node/leaf block does not appear in b-tree (ino=%lu) at key=%llu, level=%d",

				   btree->b_inode->i_ino,

				   (unsigned long long)key, level);
@@ -2134,7 +2134,7 @@ static void nilfs_btree_add_dirty_buffer(struct nilfs_bmap *btree, 
	if (level < NILFS_BTREE_LEVEL_NODE_MIN ||

	    level >= NILFS_BTREE_LEVEL_MAX) {

		dump_stack();

		nilfs_msg(btree->b_inode->i_sb, KERN_WARNING,

		nilfs_warn(btree->b_inode->i_sb,

			   "invalid btree level: %d (key=%llu, ino=%lu, blocknr=%llu)",

			   level, (unsigned long long)key,

			   btree->b_inode->i_ino,

fs/nilfs2/cpfile.c

+4 −6
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile, 
	int ret, ncps, nicps, nss, count, i;



	if (unlikely(start == 0 || start > end)) {

		nilfs_msg(cpfile->i_sb, KERN_ERR,

		nilfs_err(cpfile->i_sb,

			  "cannot delete checkpoints: invalid range [%llu, %llu)",

			  (unsigned long long)start, (unsigned long long)end);

		return -EINVAL;
@@ -376,7 +376,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile, 
								   cpfile, cno);

					if (ret == 0)

						continue;

					nilfs_msg(cpfile->i_sb, KERN_ERR,

					nilfs_err(cpfile->i_sb,

						  "error %d deleting checkpoint block",

						  ret);

					break;
@@ -981,12 +981,10 @@ int nilfs_cpfile_read(struct super_block *sb, size_t cpsize, 
	int err;



	if (cpsize > sb->s_blocksize) {

		nilfs_msg(sb, KERN_ERR,

			  "too large checkpoint size: %zu bytes", cpsize);

		nilfs_err(sb, "too large checkpoint size: %zu bytes", cpsize);

		return -EINVAL;

	} else if (cpsize < NILFS_MIN_CHECKPOINT_SIZE) {

		nilfs_msg(sb, KERN_ERR,

			  "too small checkpoint size: %zu bytes", cpsize);

		nilfs_err(sb, "too small checkpoint size: %zu bytes", cpsize);

		return -EINVAL;

	}

fs/nilfs2/dat.c

+7 −7
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr) 
	kaddr = kmap_atomic(entry_bh->b_page);

	entry = nilfs_palloc_block_get_entry(dat, vblocknr, entry_bh, kaddr);

	if (unlikely(entry->de_blocknr == cpu_to_le64(0))) {

		nilfs_msg(dat->i_sb, KERN_CRIT,

		nilfs_crit(dat->i_sb,

			   "%s: invalid vblocknr = %llu, [%llu, %llu)",

			   __func__, (unsigned long long)vblocknr,

			   (unsigned long long)le64_to_cpu(entry->de_start),
@@ -485,11 +485,11 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size, 
	int err;



	if (entry_size > sb->s_blocksize) {

		nilfs_msg(sb, KERN_ERR, "too large DAT entry size: %zu bytes",

		nilfs_err(sb, "too large DAT entry size: %zu bytes",

			  entry_size);

		return -EINVAL;

	} else if (entry_size < NILFS_MIN_DAT_ENTRY_SIZE) {

		nilfs_msg(sb, KERN_ERR, "too small DAT entry size: %zu bytes",

		nilfs_err(sb, "too small DAT entry size: %zu bytes",

			  entry_size);

		return -EINVAL;

	}

fs/nilfs2/direct.c

+8 −6
Original line number Diff line number Diff line
@@ -333,15 +333,17 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap, 


	key = nilfs_bmap_data_get_key(bmap, *bh);

	if (unlikely(key > NILFS_DIRECT_KEY_MAX)) {

		nilfs_msg(bmap->b_inode->i_sb, KERN_CRIT,

			  "%s (ino=%lu): invalid key: %llu", __func__,

		nilfs_crit(bmap->b_inode->i_sb,

			   "%s (ino=%lu): invalid key: %llu",

			   __func__,

			   bmap->b_inode->i_ino, (unsigned long long)key);

		return -EINVAL;

	}

	ptr = nilfs_direct_get_ptr(bmap, key);

	if (unlikely(ptr == NILFS_BMAP_INVALID_PTR)) {

		nilfs_msg(bmap->b_inode->i_sb, KERN_CRIT,

			  "%s (ino=%lu): invalid pointer: %llu", __func__,

		nilfs_crit(bmap->b_inode->i_sb,

			   "%s (ino=%lu): invalid pointer: %llu",

			   __func__,

			   bmap->b_inode->i_ino, (unsigned long long)ptr);

		return -EINVAL;

	}