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

Commit feee880f authored by Ryusuke Konishi's avatar Ryusuke Konishi Committed by Linus Torvalds
Browse files

nilfs2: reduce bare use of printk() with nilfs_msg() 

Replace most use of printk() in nilfs2 implementation with nilfs_msg(),
and reduce the following checkpatch.pl warning:

  "WARNING: Prefer [subsystem eg: netdev]_crit([subsystem]dev, ...
   then dev_crit(dev, ... then pr_crit(...  to printk(KERN_CRIT ..."

This patch also fixes a minor checkpatch warning "WARNING: quoted string
split across lines" that often accompanies the prior warning, and amends
message format as needed.

Link: http://lkml.kernel.org/r/1464875891-5443-5-git-send-email-konishi.ryusuke@lab.ntt.co.jp


Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6625689e

fs/nilfs2/btree.c

+33 −25
Original line number Diff line number Diff line
@@ -339,12 +339,14 @@ static int nilfs_btree_node_lookup(const struct nilfs_btree_node *node, 
 * nilfs_btree_node_broken - verify consistency of btree node

 * @node: btree node block to be examined

 * @size: node size (in bytes)

 * @inode: host inode of btree

 * @blocknr: block number

 *

 * Return Value: If node is broken, 1 is returned. Otherwise, 0 is returned.

 */

static int nilfs_btree_node_broken(const struct nilfs_btree_node *node,

				   size_t size, sector_t blocknr)

				   size_t size, struct inode *inode,

				   sector_t blocknr)

{

	int level, flags, nchildren;

	int ret = 0;
@@ -358,9 +360,10 @@ 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))) {

		printk(KERN_CRIT "NILFS: bad btree node (blocknr=%llu): "

		       "level = %d, flags = 0x%x, nchildren = %d\n",

		       (unsigned long long)blocknr, level, flags, nchildren);

		nilfs_msg(inode->i_sb, KERN_CRIT,

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

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

			  flags, nchildren);

		ret = 1;

	}

	return ret;
@@ -369,12 +372,12 @@ static int nilfs_btree_node_broken(const struct nilfs_btree_node *node, 
/**

 * nilfs_btree_root_broken - verify consistency of btree root node

 * @node: btree root node to be examined

 * @ino: inode number

 * @inode: host inode of btree

 *

 * Return Value: If node is broken, 1 is returned. Otherwise, 0 is returned.

 */

static int nilfs_btree_root_broken(const struct nilfs_btree_node *node,

				   unsigned long ino)

				   struct inode *inode)

{

	int level, flags, nchildren;

	int ret = 0;
@@ -387,8 +390,9 @@ 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)) {

		pr_crit("NILFS: bad btree root (inode number=%lu): level = %d, flags = 0x%x, nchildren = %d\n",

			ino, level, flags, nchildren);

		nilfs_msg(inode->i_sb, KERN_CRIT,

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

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

		ret = 1;

	}

	return ret;
@@ -396,13 +400,15 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node, 


int nilfs_btree_broken_node_block(struct buffer_head *bh)

{

	struct inode *inode;

	int ret;



	if (buffer_nilfs_checked(bh))

		return 0;



	inode = bh->b_page->mapping->host;

	ret = nilfs_btree_node_broken((struct nilfs_btree_node *)bh->b_data,

				       bh->b_size, bh->b_blocknr);

				      bh->b_size, inode, bh->b_blocknr);

	if (likely(!ret))

		set_buffer_nilfs_checked(bh);

	return ret;
@@ -448,12 +454,14 @@ nilfs_btree_get_node(const struct nilfs_bmap *btree, 
	return node;

}



static int

nilfs_btree_bad_node(struct nilfs_btree_node *node, int level)

static int nilfs_btree_bad_node(const struct nilfs_bmap *btree,

				struct nilfs_btree_node *node, int level)

{

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

		dump_stack();

		printk(KERN_CRIT "NILFS: btree level mismatch: %d != %d\n",

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

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

			  btree->b_inode->i_ino,

			  nilfs_btree_node_get_level(node), level);

		return 1;

	}
@@ -568,7 +576,7 @@ static int nilfs_btree_do_lookup(const struct nilfs_bmap *btree, 
			return ret;



		node = nilfs_btree_get_nonroot_node(path, level);

		if (nilfs_btree_bad_node(node, level))

		if (nilfs_btree_bad_node(btree, node, level))

			return -EINVAL;

		if (!found)

			found = nilfs_btree_node_lookup(node, key, &index);
@@ -616,7 +624,7 @@ static int nilfs_btree_do_lookup_last(const struct nilfs_bmap *btree, 
		if (ret < 0)

			return ret;

		node = nilfs_btree_get_nonroot_node(path, level);

		if (nilfs_btree_bad_node(node, level))

		if (nilfs_btree_bad_node(btree, node, level))

			return -EINVAL;

		index = nilfs_btree_node_get_nchildren(node) - 1;

		ptr = nilfs_btree_node_get_ptr(node, index, ncmax);
@@ -2072,8 +2080,10 @@ 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))

			printk(KERN_CRIT "%s: key = %llu, level == %d\n",

			       __func__, (unsigned long long)key, level);

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

				  "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);

		goto out;

	}
@@ -2110,11 +2120,10 @@ 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();

		printk(KERN_WARNING

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

		       "blocknr=%llu)\n",

		       __func__, level, (unsigned long long)key,

		       NILFS_BMAP_I(btree)->vfs_inode.i_ino,

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

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

			  level, (unsigned long long)key,

			  btree->b_inode->i_ino,

			  (unsigned long long)bh->b_blocknr);

		return;

	}
@@ -2394,8 +2403,7 @@ int nilfs_btree_init(struct nilfs_bmap *bmap) 


	__nilfs_btree_init(bmap);



	if (nilfs_btree_root_broken(nilfs_btree_get_root(bmap),

				    bmap->b_inode->i_ino))

	if (nilfs_btree_root_broken(nilfs_btree_get_root(bmap), bmap->b_inode))

		ret = -EIO;

	return ret;

}

fs/nilfs2/cpfile.c

+10 −12
Original line number Diff line number Diff line
@@ -332,8 +332,8 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile, 
	int ret, ncps, nicps, nss, count, i;



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

		printk(KERN_ERR "%s: invalid range of checkpoint numbers: "

		       "[%llu, %llu)\n", __func__,

		nilfs_msg(cpfile->i_sb, KERN_ERR,

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

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

		return -EINVAL;

	}
@@ -386,9 +386,9 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile, 
								   cpfile, cno);

					if (ret == 0)

						continue;

					printk(KERN_ERR

					       "%s: cannot delete block\n",

					       __func__);

					nilfs_msg(cpfile->i_sb, KERN_ERR,

						  "error %d deleting checkpoint block",

						  ret);

					break;

				}

			}
@@ -991,14 +991,12 @@ int nilfs_cpfile_read(struct super_block *sb, size_t cpsize, 
	int err;



	if (cpsize > sb->s_blocksize) {

		printk(KERN_ERR

		       "NILFS: too large checkpoint size: %zu bytes.\n",

		       cpsize);

		nilfs_msg(sb, KERN_ERR,

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

		return -EINVAL;

	} else if (cpsize < NILFS_MIN_CHECKPOINT_SIZE) {

		printk(KERN_ERR

		       "NILFS: too small checkpoint size: %zu bytes.\n",

		       cpsize);

		nilfs_msg(sb, KERN_ERR,

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

		return -EINVAL;

	}

fs/nilfs2/dat.c

+9 −10
Original line number Diff line number Diff line
@@ -349,8 +349,9 @@ 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))) {

		printk(KERN_CRIT "%s: vbn = %llu, [%llu, %llu)\n", __func__,

		       (unsigned long long)vblocknr,

		nilfs_msg(dat->i_sb, KERN_CRIT,

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

			  __func__, (unsigned long long)vblocknr,

			  (unsigned long long)le64_to_cpu(entry->de_start),

			  (unsigned long long)le64_to_cpu(entry->de_end));

		kunmap_atomic(kaddr);
@@ -479,13 +480,11 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size, 
	int err;



	if (entry_size > sb->s_blocksize) {

		printk(KERN_ERR

		       "NILFS: too large DAT entry size: %zu bytes.\n",

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

			  entry_size);

		return -EINVAL;

	} else if (entry_size < NILFS_MIN_DAT_ENTRY_SIZE) {

		printk(KERN_ERR

		       "NILFS: too small DAT entry size: %zu bytes.\n",

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

			  entry_size);

		return -EINVAL;

	}

fs/nilfs2/direct.c

+6 −4
Original line number Diff line number Diff line
@@ -337,14 +337,16 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap, 


	key = nilfs_bmap_data_get_key(bmap, *bh);

	if (unlikely(key > NILFS_DIRECT_KEY_MAX)) {

		printk(KERN_CRIT "%s: invalid key: %llu\n", __func__,

		       (unsigned long long)key);

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

			  "%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)) {

		printk(KERN_CRIT "%s: invalid pointer: %llu\n", __func__,

		       (unsigned long long)ptr);

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

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

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

		return -EINVAL;

	}

fs/nilfs2/inode.c

+4 −7
Original line number Diff line number Diff line
@@ -112,12 +112,9 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff, 
				 * However, the page having this block must

				 * be locked in this case.

				 */

				printk(KERN_WARNING

				       "nilfs_get_block: a race condition "

				       "while inserting a data block. "

				       "(inode number=%lu, file block "

				       "offset=%llu)\n",

				       inode->i_ino,

				nilfs_msg(inode->i_sb, KERN_WARNING,

					  "%s (ino=%lu): a race condition while inserting a data block at offset=%llu",

					  __func__, inode->i_ino,

					  (unsigned long long)blkoff);

				err = 0;

			}