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

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

nilfs2: replace nilfs_warning() with nilfs_msg() 

Use nilfs_msg() to output warning messages and get rid of
nilfs_warning() function.  This also removes function names from the
messages unless we embed them explicitly in format strings.  Instead,
some messages are revised to clarify the context.

[arnd@arndb.de: avoid warning about unused variables]
  Link: http://lkml.kernel.org/r/20160615201945.3348205-1-arnd@arndb.de
Link: http://lkml.kernel.org/r/1464875891-5443-6-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 feee880f

fs/nilfs2/alloc.c

+21 −24
Original line number Diff line number Diff line
@@ -622,10 +622,10 @@ 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_warning(inode->i_sb, __func__,

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

			      (unsigned long long)req->pr_entry_nr,

			      (unsigned long)inode->i_ino);

		nilfs_msg(inode->i_sb, KERN_WARNING,

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

			  __func__, inode->i_ino,

			  (unsigned long long)req->pr_entry_nr);

	else

		nilfs_palloc_group_desc_add_entries(desc, lock, 1);
@@ -663,10 +663,10 @@ 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_warning(inode->i_sb, __func__,

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

			      (unsigned long long)req->pr_entry_nr,

			      (unsigned long)inode->i_ino);

		nilfs_msg(inode->i_sb, KERN_WARNING,

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

			  __func__, inode->i_ino,

			  (unsigned long long)req->pr_entry_nr);

	else

		nilfs_palloc_group_desc_add_entries(desc, lock, 1);
@@ -772,10 +772,10 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
		do {

			if (!nilfs_clear_bit_atomic(lock, group_offset,

						    bitmap)) {

				nilfs_warning(inode->i_sb, __func__,

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

					      (unsigned long long)entry_nrs[j],

					      (unsigned long)inode->i_ino);

				nilfs_msg(inode->i_sb, KERN_WARNING,

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

					  __func__, inode->i_ino,

					  (unsigned long long)entry_nrs[j]);

			} else {

				n++;

			}
@@ -816,12 +816,11 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
		for (k = 0; k < nempties; k++) {

			ret = nilfs_palloc_delete_entry_block(inode,

							      last_nrs[k]);

			if (ret && ret != -ENOENT) {

				nilfs_warning(inode->i_sb, __func__,

					      "failed to delete block of entry %llu: ino=%lu, err=%d",

					      (unsigned long long)last_nrs[k],

					      (unsigned long)inode->i_ino, ret);

			}

			if (ret && ret != -ENOENT)

				nilfs_msg(inode->i_sb, KERN_WARNING,

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

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

					  inode->i_ino);

		}



		desc_kaddr = kmap_atomic(desc_bh->b_page);
@@ -835,12 +834,10 @@ 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_warning(inode->i_sb, __func__,

					      "failed to delete bitmap block of group %lu: ino=%lu, err=%d",

					      group,

					      (unsigned long)inode->i_ino, ret);

			}

			if (ret && ret != -ENOENT)

				nilfs_msg(inode->i_sb, KERN_WARNING,

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

					  ret, group, inode->i_ino);

		}

	}

	return 0;

fs/nilfs2/ifile.c

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ int nilfs_ifile_get_inode_block(struct inode *ifile, ino_t ino, 


	err = nilfs_palloc_get_entry_block(ifile, ino, 0, out_bh);

	if (unlikely(err))

		nilfs_warning(sb, __func__, "unable to read inode: %lu",

			      (unsigned long) ino);

		nilfs_msg(sb, KERN_WARNING, "error %d reading inode: ino=%lu",

			  err, (unsigned long)ino);

	return err;

}

fs/nilfs2/inode.c

+11 −10
Original line number Diff line number Diff line
@@ -723,9 +723,9 @@ static void nilfs_truncate_bmap(struct nilfs_inode_info *ii, 
		goto repeat;



failed:

	nilfs_warning(ii->vfs_inode.i_sb, __func__,

		      "failed to truncate bmap (ino=%lu, err=%d)",

		      ii->vfs_inode.i_ino, ret);

	nilfs_msg(ii->vfs_inode.i_sb, KERN_WARNING,

		  "error %d truncating bmap (ino=%lu)", ret,

		  ii->vfs_inode.i_ino);

}



void nilfs_truncate(struct inode *inode)
@@ -936,8 +936,8 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned int nr_dirty) 
			 * This will happen when somebody is freeing

			 * this inode.

			 */

			nilfs_warning(inode->i_sb, __func__,

				      "cannot get inode (ino=%lu)",

			nilfs_msg(inode->i_sb, KERN_WARNING,

				  "cannot set file dirty (ino=%lu): the file is being freed",

				  inode->i_ino);

			spin_unlock(&nilfs->ns_inode_lock);

			return -EINVAL; /*
@@ -959,8 +959,9 @@ int __nilfs_mark_inode_dirty(struct inode *inode, int flags) 


	err = nilfs_load_inode_block(inode, &ibh);

	if (unlikely(err)) {

		nilfs_warning(inode->i_sb, __func__,

			      "failed to reget inode block.");

		nilfs_msg(inode->i_sb, KERN_WARNING,

			  "cannot mark inode dirty (ino=%lu): error %d loading inode block",

			  inode->i_ino, err);

		return err;

	}

	nilfs_update_inode(inode, ibh, flags);
@@ -986,7 +987,7 @@ void nilfs_dirty_inode(struct inode *inode, int flags) 
	struct nilfs_mdt_info *mdi = NILFS_MDT(inode);



	if (is_bad_inode(inode)) {

		nilfs_warning(inode->i_sb, __func__,

		nilfs_msg(inode->i_sb, KERN_WARNING,

			  "tried to mark bad_inode dirty. ignored.");

		dump_stack();

		return;

fs/nilfs2/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry) 
		goto out;



	if (!inode->i_nlink) {

		nilfs_warning(inode->i_sb, __func__,

			      "deleting nonexistent file (%lu), %d",

		nilfs_msg(inode->i_sb, KERN_WARNING,

			  "deleting nonexistent file (ino=%lu), %d",

			  inode->i_ino, inode->i_nlink);

		set_nlink(inode, 1);

	}

fs/nilfs2/nilfs.h

+4 −3
Original line number Diff line number Diff line
@@ -306,8 +306,6 @@ void __nilfs_msg(struct super_block *sb, const char *level, 
extern __printf(3, 4)

void __nilfs_error(struct super_block *sb, const char *function,

		   const char *fmt, ...);

extern __printf(3, 4)

void nilfs_warning(struct super_block *, const char *, const char *, ...);



#ifdef CONFIG_PRINTK
@@ -319,7 +317,10 @@ void nilfs_warning(struct super_block *, const char *, const char *, ...); 
#else



#define nilfs_msg(sb, level, fmt, ...)					\

	no_printk(fmt, ##__VA_ARGS__)

	do {								\

		no_printk(fmt, ##__VA_ARGS__);				\

		(void)(sb);						\

	} while (0)

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

	do {								\

		no_printk(fmt, ##__VA_ARGS__);				\