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

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

fs/affs: pr_debug cleanup 



- Remove AFFS: prefix (defined in pr_fmt)

- Use __func__

- Separate format/arguments on lines > 80 characters.

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 0158de12

fs/affs/affs.h

+5 −5
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ affs_set_blocksize(struct super_block *sb, int size) 
static inline struct buffer_head *

affs_bread(struct super_block *sb, int block)

{

	pr_debug("affs_bread: %d\n", block);

	pr_debug("%s: %d\n", __func__, block);

	if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size)

		return sb_bread(sb, block);

	return NULL;
@@ -220,7 +220,7 @@ affs_bread(struct super_block *sb, int block) 
static inline struct buffer_head *

affs_getblk(struct super_block *sb, int block)

{

	pr_debug("affs_getblk: %d\n", block);

	pr_debug("%s: %d\n", __func__, block);

	if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size)

		return sb_getblk(sb, block);

	return NULL;
@@ -229,7 +229,7 @@ static inline struct buffer_head * 
affs_getzeroblk(struct super_block *sb, int block)

{

	struct buffer_head *bh;

	pr_debug("affs_getzeroblk: %d\n", block);

	pr_debug("%s: %d\n", __func__, block);

	if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size) {

		bh = sb_getblk(sb, block);

		lock_buffer(bh);
@@ -244,7 +244,7 @@ static inline struct buffer_head * 
affs_getemptyblk(struct super_block *sb, int block)

{

	struct buffer_head *bh;

	pr_debug("affs_getemptyblk: %d\n", block);

	pr_debug("%s: %d\n", __func__, block);

	if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size) {

		bh = sb_getblk(sb, block);

		wait_on_buffer(bh);
@@ -257,7 +257,7 @@ static inline void 
affs_brelse(struct buffer_head *bh)

{

	if (bh)

		pr_debug("affs_brelse: %lld\n", (long long) bh->b_blocknr);

		pr_debug("%s: %lld\n", __func__, (long long) bh->b_blocknr);

	brelse(bh);

}

fs/affs/amigaffs.c

+5 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh) 
	ino = bh->b_blocknr;

	offset = affs_hash_name(sb, AFFS_TAIL(sb, bh)->name + 1, AFFS_TAIL(sb, bh)->name[0]);



	pr_debug("AFFS: insert_hash(dir=%u, ino=%d)\n", (u32)dir->i_ino, ino);

	pr_debug("%s(dir=%u, ino=%d)\n", __func__, (u32)dir->i_ino, ino);



	dir_bh = affs_bread(sb, dir->i_ino);

	if (!dir_bh)
@@ -84,7 +84,8 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh) 
	sb = dir->i_sb;

	rem_ino = rem_bh->b_blocknr;

	offset = affs_hash_name(sb, AFFS_TAIL(sb, rem_bh)->name+1, AFFS_TAIL(sb, rem_bh)->name[0]);

	pr_debug("AFFS: remove_hash(dir=%d, ino=%d, hashval=%d)\n", (u32)dir->i_ino, rem_ino, offset);

	pr_debug("%s(dir=%d, ino=%d, hashval=%d)\n",

		 __func__, (u32)dir->i_ino, rem_ino, offset);



	bh = affs_bread(sb, dir->i_ino);

	if (!bh)
@@ -147,7 +148,7 @@ affs_remove_link(struct dentry *dentry) 
	u32 link_ino, ino;

	int retval;



	pr_debug("AFFS: remove_link(key=%ld)\n", inode->i_ino);

	pr_debug("%s(key=%ld)\n", __func__, inode->i_ino);

	retval = -EIO;

	bh = affs_bread(sb, inode->i_ino);

	if (!bh)
@@ -279,7 +280,7 @@ affs_remove_header(struct dentry *dentry) 
	if (!inode)

		goto done;



	pr_debug("AFFS: remove_header(key=%ld)\n", inode->i_ino);

	pr_debug("%s(key=%ld)\n", __func__, inode->i_ino);

	retval = -EIO;

	bh = affs_bread(sb, (u32)(long)dentry->d_fsdata);

	if (!bh)

fs/affs/bitmap.c

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ affs_count_free_blocks(struct super_block *sb) 
	u32 free;

	int i;



	pr_debug("AFFS: count_free_blocks()\n");

	pr_debug("%s()\n", __func__);



	if (sb->s_flags & MS_RDONLY)

		return 0;
@@ -43,7 +43,7 @@ affs_free_block(struct super_block *sb, u32 block) 
	u32 blk, bmap, bit, mask, tmp;

	__be32 *data;



	pr_debug("AFFS: free_block(%u)\n", block);

	pr_debug("%s(%u)\n", __func__, block);



	if (block > sbi->s_partition_size)

		goto err_range;
@@ -125,7 +125,7 @@ affs_alloc_block(struct inode *inode, u32 goal) 
	sb = inode->i_sb;

	sbi = AFFS_SB(sb);



	pr_debug("AFFS: balloc(inode=%lu,goal=%u): ", inode->i_ino, goal);

	pr_debug("balloc(inode=%lu,goal=%u): ", inode->i_ino, goal);



	if (AFFS_I(inode)->i_pa_cnt) {

		pr_debug("%d\n", AFFS_I(inode)->i_lastalloc+1);
@@ -291,7 +291,7 @@ int affs_init_bitmap(struct super_block *sb, int *flags) 
			*flags |= MS_RDONLY;

			goto out;

		}

		pr_debug("AFFS: read bitmap block %d: %d\n", blk, bm->bm_key);

		pr_debug("read bitmap block %d: %d\n", blk, bm->bm_key);

		bm->bm_free = memweight(bh->b_data + 4, sb->s_blocksize - 4);



		/* Don't try read the extension if this is the last block,

fs/affs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ affs_readdir(struct file *file, struct dir_context *ctx) 
	u32			 ino;

	int			 error = 0;



	pr_debug("AFFS: readdir(ino=%lu,f_pos=%lx)\n",

		 inode->i_ino, (unsigned long)ctx->pos);

	pr_debug("%s(ino=%lu,f_pos=%lx)\n",

		 __func__, inode->i_ino, (unsigned long)ctx->pos);



	if (ctx->pos < 2) {

		file->private_data = (void *)0;
@@ -81,7 +81,7 @@ affs_readdir(struct file *file, struct dir_context *ctx) 
	 */

	ino = (u32)(long)file->private_data;

	if (ino && file->f_version == inode->i_version) {

		pr_debug("AFFS: readdir() left off=%d\n", ino);

		pr_debug("readdir() left off=%d\n", ino);

		goto inside;

	}
@@ -117,7 +117,7 @@ affs_readdir(struct file *file, struct dir_context *ctx) 


			namelen = min(AFFS_TAIL(sb, fh_bh)->name[0], (u8)30);

			name = AFFS_TAIL(sb, fh_bh)->name + 1;

			pr_debug("AFFS: readdir(): dir_emit(\"%.*s\", "

			pr_debug("readdir(): dir_emit(\"%.*s\", "

				 "ino=%u), hash=%d, f_pos=%x\n",

				 namelen, name, ino, hash_pos, (u32)ctx->pos);

fs/affs/file.c

+14 −10
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ const struct inode_operations affs_file_inode_operations = { 
static int

affs_file_open(struct inode *inode, struct file *filp)

{

	pr_debug("AFFS: open(%lu,%d)\n",

	pr_debug("open(%lu,%d)\n",

		 inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt));

	atomic_inc(&AFFS_I(inode)->i_opencnt);

	return 0;
@@ -54,7 +54,7 @@ affs_file_open(struct inode *inode, struct file *filp) 
static int

affs_file_release(struct inode *inode, struct file *filp)

{

	pr_debug("AFFS: release(%lu, %d)\n",

	pr_debug("release(%lu, %d)\n",

		 inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt));



	if (atomic_dec_and_test(&AFFS_I(inode)->i_opencnt)) {
@@ -324,7 +324,8 @@ affs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh_resul 
	struct buffer_head	*ext_bh;

	u32			 ext;



	pr_debug("AFFS: get_block(%u, %lu)\n", (u32)inode->i_ino, (unsigned long)block);

	pr_debug("%s(%u, %lu)\n",

		 __func__, (u32)inode->i_ino, (unsigned long)block);



	BUG_ON(block > (sector_t)0x7fffffffUL);
@@ -508,7 +509,7 @@ affs_do_readpage_ofs(struct page *page, unsigned to) 
	u32 bidx, boff, bsize;

	u32 tmp;



	pr_debug("AFFS: read_page(%u, %ld, 0, %d)\n", (u32)inode->i_ino,

	pr_debug("%s(%u, %ld, 0, %d)\n", __func__, (u32)inode->i_ino,

		 page->index, to);

	BUG_ON(to > PAGE_CACHE_SIZE);

	kmap(page);
@@ -544,7 +545,7 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize) 
	u32 size, bsize;

	u32 tmp;



	pr_debug("AFFS: extent_file(%u, %d)\n", (u32)inode->i_ino, newsize);

	pr_debug("%s(%u, %d)\n", __func__, (u32)inode->i_ino, newsize);

	bsize = AFFS_SB(sb)->s_data_blksize;

	bh = NULL;

	size = AFFS_I(inode)->mmu_private;
@@ -610,7 +611,7 @@ affs_readpage_ofs(struct file *file, struct page *page) 
	u32 to;

	int err;



	pr_debug("AFFS: read_page(%u, %ld)\n", (u32)inode->i_ino, page->index);

	pr_debug("%s(%u, %ld)\n", __func__, (u32)inode->i_ino, page->index);

	to = PAGE_CACHE_SIZE;

	if (((page->index + 1) << PAGE_CACHE_SHIFT) > inode->i_size) {

		to = inode->i_size & ~PAGE_CACHE_MASK;
@@ -633,7 +634,8 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping 
	pgoff_t index;

	int err = 0;



	pr_debug("AFFS: write_begin(%u, %llu, %llu)\n", (u32)inode->i_ino, (unsigned long long)pos, (unsigned long long)pos + len);

	pr_debug("%s(%u, %llu, %llu)\n", __func__, (u32)inode->i_ino,

		 (unsigned long long)pos, (unsigned long long)pos + len);

	if (pos > AFFS_I(inode)->mmu_private) {

		/* XXX: this probably leaves a too-big i_size in case of

		 * failure. Should really be updating i_size at write_end time
@@ -682,7 +684,9 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
	 * due to write_begin.

	 */



	pr_debug("AFFS: write_begin(%u, %llu, %llu)\n", (u32)inode->i_ino, (unsigned long long)pos, (unsigned long long)pos + len);

	pr_debug("%s(%u, %llu, %llu)\n",

		 __func__, (u32)inode->i_ino, (unsigned long long)pos,

		(unsigned long long)pos + len);

	bsize = AFFS_SB(sb)->s_data_blksize;

	data = page_address(page);
@@ -804,7 +808,7 @@ affs_free_prealloc(struct inode *inode) 
{

	struct super_block *sb = inode->i_sb;



	pr_debug("AFFS: free_prealloc(ino=%lu)\n", inode->i_ino);

	pr_debug("free_prealloc(ino=%lu)\n", inode->i_ino);



	while (AFFS_I(inode)->i_pa_cnt) {

		AFFS_I(inode)->i_pa_cnt--;
@@ -824,7 +828,7 @@ affs_truncate(struct inode *inode) 
	struct buffer_head *ext_bh;

	int i;



	pr_debug("AFFS: truncate(inode=%d, oldsize=%u, newsize=%u)\n",

	pr_debug("truncate(inode=%d, oldsize=%u, newsize=%u)\n",

		 (u32)inode->i_ino, (u32)AFFS_I(inode)->mmu_private, (u32)inode->i_size);



	last_blk = 0;