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

Commit f403d1db authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/efs: add pr_fmt / use __func__ 



Also uniformize function arguments.

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 179b87fb

fs/efs/dir.c

+7 −4
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ static int efs_readdir(struct file *file, struct dir_context *ctx) 
	int			slot;



	if (inode->i_size & (EFS_DIRBSIZE-1))

		pr_warn("EFS: WARNING: readdir(): directory size not a multiple of EFS_DIRBSIZE\n");

		pr_warn("%s(): directory size not a multiple of EFS_DIRBSIZE\n",

			__func__);



	/* work out where this entry can be found */

	block = ctx->pos >> EFS_DIRBSIZE_BITS;
@@ -43,14 +44,15 @@ static int efs_readdir(struct file *file, struct dir_context *ctx) 
		bh = sb_bread(inode->i_sb, efs_bmap(inode, block));



		if (!bh) {

			pr_err("EFS: readdir(): failed to read dir block %d\n", block);

			pr_err("%s(): failed to read dir block %d\n",

			       __func__, block);

			break;

		}



		dirblock = (struct efs_dir *) bh->b_data; 



		if (be16_to_cpu(dirblock->magic) != EFS_DIRBLK_MAGIC) {

			pr_err("EFS: readdir(): invalid directory block\n");

			pr_err("%s(): invalid directory block\n", __func__);

			brelse(bh);

			break;

		}
@@ -80,7 +82,8 @@ static int efs_readdir(struct file *file, struct dir_context *ctx) 


			/* sanity check */

			if (nameptr - (char *) dirblock + namelen > EFS_DIRBSIZE) {

				pr_warn("EFS: directory entry %d exceeds directory block\n", slot);

				pr_warn("directory entry %d exceeds directory block\n",

					slot);

				continue;

			}

fs/efs/efs.h

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,12 @@ 
#ifndef _EFS_EFS_H_

#define _EFS_EFS_H_



#ifdef pr_fmt

#undef pr_fmt

#endif



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/fs.h>

#include <asm/uaccess.h>

fs/efs/file.c

+5 −7
Original line number Diff line number Diff line
@@ -22,10 +22,8 @@ int efs_get_block(struct inode *inode, sector_t iblock, 
		/*

		 * i have no idea why this happens as often as it does

		 */

		pr_warn("EFS: bmap(): block %d >= %ld (filesize %ld)\n",

			block,

			inode->i_blocks,

			inode->i_size);

		pr_warn("%s(): block %d >= %ld (filesize %ld)\n",

			__func__, block, inode->i_blocks, inode->i_size);

#endif

		return 0;

	}
@@ -38,7 +36,7 @@ int efs_get_block(struct inode *inode, sector_t iblock, 
int efs_bmap(struct inode *inode, efs_block_t block) {



	if (block < 0) {

		pr_warn("EFS: bmap(): block < 0\n");

		pr_warn("%s(): block < 0\n", __func__);

		return 0;

	}
@@ -48,8 +46,8 @@ int efs_bmap(struct inode *inode, efs_block_t block) { 
		/*

		 * i have no idea why this happens as often as it does

		 */

		pr_warn("EFS: bmap(): block %d >= %ld (filesize %ld)\n",

			block, inode->i_blocks, inode->i_size);

		pr_warn("%s(): block %d >= %ld (filesize %ld)\n",

			__func__, block, inode->i_blocks, inode->i_size);

#endif

		return 0;

	}

fs/efs/inode.c

+14 −10
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) 


	bh = sb_bread(inode->i_sb, block);

	if (!bh) {

		pr_warn("EFS: bread() failed at block %d\n", block);

		pr_warn("%s() failed at block %d\n", __func__, block);

		goto read_inode_error;

	}
@@ -130,7 +130,8 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) 
	for(i = 0; i < EFS_DIRECTEXTENTS; i++) {

		extent_copy(&(efs_inode->di_u.di_extents[i]), &(in->extents[i]));

		if (i < in->numextents && in->extents[i].cooked.ex_magic != 0) {

			pr_warn("EFS: extent %d has bad magic number in inode %lu\n", i, inode->i_ino);

			pr_warn("extent %d has bad magic number in inode %lu\n",

				i, inode->i_ino);

			brelse(bh);

			goto read_inode_error;

		}
@@ -162,7 +163,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) 
			init_special_inode(inode, inode->i_mode, device);

			break;

		default:

			pr_warn("EFS: unsupported inode mode %o\n", inode->i_mode);

			pr_warn("unsupported inode mode %o\n", inode->i_mode);

			goto read_inode_error;

			break;

	}
@@ -171,7 +172,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) 
	return inode;

        

read_inode_error:

	pr_warn("EFS: failed to read inode %lu\n", inode->i_ino);

	pr_warn("failed to read inode %lu\n", inode->i_ino);

	iget_failed(inode);

	return ERR_PTR(-EIO);

}
@@ -216,7 +217,7 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) { 
    

		/* if we only have one extent then nothing can be found */

		if (in->numextents == 1) {

			pr_err("EFS: map_block() failed to map (1 extent)\n");

			pr_err("%s() failed to map (1 extent)\n", __func__);

			return 0;

		}
@@ -234,7 +235,7 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) { 
			}

		}



		pr_err("EFS: map_block() failed to map block %u (dir)\n", block);

		pr_err("%s() failed to map block %u (dir)\n", __func__, block);

		return 0;

	}
@@ -262,7 +263,8 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) { 


		if (dirext == direxts) {

			/* should never happen */

			pr_err("EFS: couldn't find direct extent for indirect extent %d (block %u)\n", cur, block);

			pr_err("couldn't find direct extent for indirect extent %d (block %u)\n",

			       cur, block);

			if (bh) brelse(bh);

			return 0;

		}
@@ -279,7 +281,8 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) { 


			bh = sb_bread(inode->i_sb, iblock);

			if (!bh) {

				pr_err("EFS: bread() failed at block %d\n", iblock);

				pr_err("%s() failed at block %d\n",

				       __func__, iblock);

				return 0;

			}

#ifdef DEBUG
@@ -294,7 +297,8 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) { 
		extent_copy(&(exts[ioffset]), &ext);



		if (ext.cooked.ex_magic != 0) {

			pr_err("EFS: extent %d has bad magic number in block %d\n", cur, iblock);

			pr_err("extent %d has bad magic number in block %d\n",

			       cur, iblock);

			if (bh) brelse(bh);

			return 0;

		}
@@ -306,7 +310,7 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) { 
		}

	}

	if (bh) brelse(bh);

	pr_err("EFS: map_block() failed to map block %u (indir)\n", block);

	pr_err("%s() failed to map block %u (indir)\n", __func__, block);

	return 0;

}

fs/efs/namei.c

+5 −3
Original line number Diff line number Diff line
@@ -23,20 +23,22 @@ static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len) 
	efs_block_t		block;

 

	if (inode->i_size & (EFS_DIRBSIZE-1))

		pr_warn("EFS: WARNING: find_entry(): directory size not a multiple of EFS_DIRBSIZE\n");

		pr_warn("%s(): directory size not a multiple of EFS_DIRBSIZE\n",

			__func__);



	for(block = 0; block < inode->i_blocks; block++) {



		bh = sb_bread(inode->i_sb, efs_bmap(inode, block));

		if (!bh) {

			pr_err("EFS: find_entry(): failed to read dir block %d\n", block);

			pr_err("%s(): failed to read dir block %d\n",

			       __func__, block);

			return 0;

		}

    

		dirblock = (struct efs_dir *) bh->b_data;



		if (be16_to_cpu(dirblock->magic) != EFS_DIRBLK_MAGIC) {

			pr_err("EFS: find_entry(): invalid directory block\n");

			pr_err("%s(): invalid directory block\n", __func__);

			brelse(bh);

			return(0);

		}