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

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

nilfs2: do not emit extra newline on nilfs_warning() and nilfs_error() 

This updates call sites of nilfs_warning() and nilfs_error() so that they
don't add a duplicate newline.  These output functions are already
designed to add a trailing newline to the message.

Link: http://lkml.kernel.org/r/1462886671-3521-2-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 facb9ec5

fs/nilfs2/alloc.c

+5 −5
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode, 


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

		nilfs_warning(inode->i_sb, __func__,

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

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

			      (unsigned long long)req->pr_entry_nr,

			      (unsigned long)inode->i_ino);

	else
@@ -660,7 +660,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode, 


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

		nilfs_warning(inode->i_sb, __func__,

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

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

			      (unsigned long long)req->pr_entry_nr,

			      (unsigned long)inode->i_ino);

	else
@@ -769,7 +769,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
			if (!nilfs_clear_bit_atomic(lock, group_offset,

						    bitmap)) {

				nilfs_warning(inode->i_sb, __func__,

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

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

					      (unsigned long long)entry_nrs[j],

					      (unsigned long)inode->i_ino);

			} else {
@@ -814,7 +814,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
							      last_nrs[k]);

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

				nilfs_warning(inode->i_sb, __func__,

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

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

					      (unsigned long long)last_nrs[k],

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

			}
@@ -833,7 +833,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
			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\n",

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

					      group,

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

			}

fs/nilfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap, 


	if (err == -EINVAL) {

		nilfs_error(inode->i_sb, fname,

			    "broken bmap (inode number=%lu)\n", inode->i_ino);

			    "broken bmap (inode number=%lu)", inode->i_ino);

		err = -EIO;

	}

	return err;

fs/nilfs2/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -628,8 +628,8 @@ int nilfs_empty_dir(struct inode *inode) 
		while ((char *)de <= kaddr) {

			if (de->rec_len == 0) {

				nilfs_error(inode->i_sb, __func__,

					    "zero-length directory entry "

					    "(kaddr=%p, de=%p)\n", kaddr, de);

					    "zero-length directory entry (kaddr=%p, de=%p)",

					    kaddr, de);

				goto not_empty;

			}

			if (de->inode != 0) {

fs/nilfs2/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty) 
			/* This will happen when somebody is freeing

			   this inode. */

			nilfs_warning(inode->i_sb, __func__,

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

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

				      inode->i_ino);

			spin_unlock(&nilfs->ns_inode_lock);

			return -EINVAL; /* NILFS_I_DIRTY may remain for
@@ -942,7 +942,7 @@ 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.\n");

			      "failed to reget inode block.");

		return err;

	}

	nilfs_update_inode(inode, ibh, flags);
@@ -969,7 +969,7 @@ void nilfs_dirty_inode(struct inode *inode, int flags) 


	if (is_bad_inode(inode)) {

		nilfs_warning(inode->i_sb, __func__,

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

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

		dump_stack();

		return;

	}

fs/nilfs2/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry) 


	if (!inode->i_nlink) {

		nilfs_warning(inode->i_sb, __func__,

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

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

			      inode->i_ino, inode->i_nlink);

		set_nlink(inode, 1);

	}