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

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

nilfs2: hide function name argument from nilfs_error() 

Simplify nilfs_error(), an output function used to report critical
issues in file system.  This renames the original nilfs_error() function
to __nilfs_error() and redefines it as a macro to hide its function name
argument within the macro.

Every call site of nilfs_error() is changed to strip __func__ argument
except nilfs_bmap_convert_error(); nilfs_bmap_convert_error() directly
calls __nilfs_error() because it inherits caller's function name.

Link: http://lkml.kernel.org/r/1464875891-5443-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 a310dcb7

fs/nilfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap, 
	struct inode *inode = bmap->b_inode;



	if (err == -EINVAL) {

		nilfs_error(inode->i_sb, fname,

		__nilfs_error(inode->i_sb, fname,

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

		err = -EIO;

	}

fs/nilfs2/dir.c

+17 −21
Original line number Diff line number Diff line
@@ -140,10 +140,9 @@ static bool nilfs_check_page(struct page *page) 
	/* Too bad, we had an error */



Ebadsize:

	nilfs_error(sb, "nilfs_check_page",

	nilfs_error(sb,

		    "size of directory #%lu is not a multiple of chunk size",

		    dir->i_ino

	);

		    dir->i_ino);

	goto fail;

Eshort:

	error = "rec_len is smaller than minimal";
@@ -157,17 +156,16 @@ static bool nilfs_check_page(struct page *page) 
Espan:

	error = "directory entry across blocks";

bad_entry:

	nilfs_error(sb, "nilfs_check_page", "bad entry in directory #%lu: %s - "

		    "offset=%lu, inode=%lu, rec_len=%d, name_len=%d",

	nilfs_error(sb,

		    "bad entry in directory #%lu: %s - offset=%lu, inode=%lu, rec_len=%d, name_len=%d",

		    dir->i_ino, error, (page->index << PAGE_SHIFT) + offs,

		    (unsigned long)le64_to_cpu(p->inode),

		    rec_len, p->name_len);

	goto fail;

Eend:

	p = (struct nilfs_dir_entry *)(kaddr + offs);

	nilfs_error(sb, "nilfs_check_page",

		    "entry in directory #%lu spans the page boundary"

		    "offset=%lu, inode=%lu",

	nilfs_error(sb,

		    "entry in directory #%lu spans the page boundary offset=%lu, inode=%lu",

		    dir->i_ino, (page->index << PAGE_SHIFT) + offs,

		    (unsigned long)le64_to_cpu(p->inode));

fail:
@@ -267,8 +265,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) 
		struct page *page = nilfs_get_page(inode, n);



		if (IS_ERR(page)) {

			nilfs_error(sb, __func__, "bad page in #%lu",

				    inode->i_ino);

			nilfs_error(sb, "bad page in #%lu", inode->i_ino);

			ctx->pos += PAGE_SIZE - offset;

			return -EIO;

		}
@@ -278,8 +275,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) 
			NILFS_DIR_REC_LEN(1);

		for ( ; (char *)de <= limit; de = nilfs_next_entry(de)) {

			if (de->rec_len == 0) {

				nilfs_error(sb, __func__,

					    "zero-length directory entry");

				nilfs_error(sb, "zero-length directory entry");

				nilfs_put_page(page);

				return -EIO;

			}
@@ -345,7 +341,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, 
			kaddr += nilfs_last_byte(dir, n) - reclen;

			while ((char *) de <= kaddr) {

				if (de->rec_len == 0) {

					nilfs_error(dir->i_sb, __func__,

					nilfs_error(dir->i_sb,

						"zero-length directory entry");

					nilfs_put_page(page);

					goto out;
@@ -360,7 +356,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, 
			n = 0;

		/* next page is past the blocks we've got */

		if (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) {

			nilfs_error(dir->i_sb, __func__,

			nilfs_error(dir->i_sb,

			       "dir %lu size %lld exceeds block count %llu",

			       dir->i_ino, dir->i_size,

			       (unsigned long long)dir->i_blocks);
@@ -469,7 +465,7 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode) 
				goto got_it;

			}

			if (de->rec_len == 0) {

				nilfs_error(dir->i_sb, __func__,

				nilfs_error(dir->i_sb,

					    "zero-length directory entry");

				err = -EIO;

				goto out_unlock;
@@ -541,7 +537,7 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page) 


	while ((char *)de < (char *)dir) {

		if (de->rec_len == 0) {

			nilfs_error(inode->i_sb, __func__,

			nilfs_error(inode->i_sb,

				    "zero-length directory entry");

			err = -EIO;

			goto out;
@@ -628,7 +624,7 @@ int nilfs_empty_dir(struct inode *inode) 


		while ((char *)de <= kaddr) {

			if (de->rec_len == 0) {

				nilfs_error(inode->i_sb, __func__,

				nilfs_error(inode->i_sb,

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

					    kaddr, de);

				goto not_empty;

fs/nilfs2/ifile.c

+1 −2
Original line number Diff line number Diff line
@@ -145,8 +145,7 @@ int nilfs_ifile_get_inode_block(struct inode *ifile, ino_t ino, 
	int err;



	if (unlikely(!NILFS_VALID_INODE(sb, ino))) {

		nilfs_error(sb, __func__, "bad inode number: %lu",

			    (unsigned long) ino);

		nilfs_error(sb, "bad inode number: %lu", (unsigned long)ino);

		return -EINVAL;

	}

fs/nilfs2/nilfs.h

+19 −1
Original line number Diff line number Diff line
@@ -299,10 +299,28 @@ static inline int nilfs_mark_inode_dirty_sync(struct inode *inode) 
/* super.c */

extern struct inode *nilfs_alloc_inode(struct super_block *);

extern void nilfs_destroy_inode(struct inode *);



extern __printf(3, 4)

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

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



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

	__nilfs_error(sb, __func__, fmt, ##__VA_ARGS__)



#else



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

	do {								\

		no_printk(fmt, ##__VA_ARGS__);				\

		__nilfs_error(sb, "", " ");				\

	} while (0)



#endif /* CONFIG_PRINTK */



extern struct nilfs_super_block *

nilfs_read_super_block(struct super_block *, u64, int, struct buffer_head **);

extern int nilfs_store_magic_and_option(struct super_block *,

fs/nilfs2/super.c

+12 −10
Original line number Diff line number Diff line
@@ -91,18 +91,20 @@ static void nilfs_set_error(struct super_block *sb) 
}



/**

 * nilfs_error() - report failure condition on a filesystem

 * __nilfs_error() - report failure condition on a filesystem

 *

 * nilfs_error() sets an ERROR_FS flag on the superblock as well as

 * reporting an error message.  It should be called when NILFS detects

 * incoherences or defects of meta data on disk.  As for sustainable

 * errors such as a single-shot I/O error, nilfs_warning() or the printk()

 * function should be used instead.

 * __nilfs_error() sets an ERROR_FS flag on the superblock as well as

 * reporting an error message.  This function should be called when

 * NILFS detects incoherences or defects of meta data on disk.

 *

 * The segment constructor must not call this function because it can

 * kill itself.

 * This implements the body of nilfs_error() macro.  Normally,

 * nilfs_error() should be used.  As for sustainable errors such as a

 * single-shot I/O error, nilfs_warning() or printk() should be used

 * instead.

 *

 * Callers should not add a trailing newline since this will do it.

 */

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

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

		   const char *fmt, ...)

{

	struct the_nilfs *nilfs = sb->s_fs_info;