Commit 6c311ec6 authored by Chris Fries's avatar Chris Fries Committed by Jaegeuk Kim
Browse files

f2fs: clean checkpatch warnings 



Fixed a variety of trivial checkpatch warnings.  The only delta should
be some minor formatting on log strings that were split / too long.

Signed-off-by: default avatarChris Fries <cfries@motorola.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent c434cbc0

fs/f2fs/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int stat_show(struct seq_file *s, void *v) 
		seq_printf(s, "  - node blocks : %d\n", si->node_blks);

		seq_printf(s, "\nExtent Hit Ratio: %d / %d\n",

			   si->hit_ext, si->total_ext);

		seq_printf(s, "\nBalancing F2FS Async:\n");

		seq_puts(s, "\nBalancing F2FS Async:\n");

		seq_printf(s, "  - nodes: %4d in %4d\n",

			   si->ndirty_node, si->node_pages);

		seq_printf(s, "  - dents: %4d in dirs:%4d\n",

fs/f2fs/dir.c

+3 −2
Original line number Diff line number Diff line
@@ -430,7 +430,8 @@ static int room_for_filename(struct f2fs_dentry_block *dentry_blk, int slots) 
 * Caller should grab and release a rwsem by calling f2fs_lock_op() and

 * f2fs_unlock_op().

 */

int __f2fs_add_link(struct inode *dir, const struct qstr *name, struct inode *inode)

int __f2fs_add_link(struct inode *dir, const struct qstr *name,

						struct inode *inode)

{

	unsigned int bit_pos;

	unsigned int level;

fs/f2fs/f2fs.h

+3 −3
Original line number Diff line number Diff line
@@ -607,9 +607,9 @@ static inline int check_nid_range(struct f2fs_sb_info *sbi, nid_t nid) 
static inline int F2FS_HAS_BLOCKS(struct inode *inode)

{

	if (F2FS_I(inode)->i_xattr_nid)

		return (inode->i_blocks > F2FS_DEFAULT_ALLOCATED_BLOCKS + 1);

		return inode->i_blocks > F2FS_DEFAULT_ALLOCATED_BLOCKS + 1;

	else

		return (inode->i_blocks > F2FS_DEFAULT_ALLOCATED_BLOCKS);

		return inode->i_blocks > F2FS_DEFAULT_ALLOCATED_BLOCKS;

}



static inline bool inc_valid_block_count(struct f2fs_sb_info *sbi,

fs/f2fs/inode.c

+8 −4
Original line number Diff line number Diff line
@@ -42,9 +42,11 @@ static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri) 
	if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||

			S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {

		if (ri->i_addr[0])

			inode->i_rdev = old_decode_dev(le32_to_cpu(ri->i_addr[0]));

			inode->i_rdev =

				old_decode_dev(le32_to_cpu(ri->i_addr[0]));

		else

			inode->i_rdev = new_decode_dev(le32_to_cpu(ri->i_addr[1]));

			inode->i_rdev =

				new_decode_dev(le32_to_cpu(ri->i_addr[1]));

	}

}
@@ -52,11 +54,13 @@ static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri) 
{

	if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) {

		if (old_valid_dev(inode->i_rdev)) {

			ri->i_addr[0] = cpu_to_le32(old_encode_dev(inode->i_rdev));

			ri->i_addr[0] =

				cpu_to_le32(old_encode_dev(inode->i_rdev));

			ri->i_addr[1] = 0;

		} else {

			ri->i_addr[0] = 0;

			ri->i_addr[1] = cpu_to_le32(new_encode_dev(inode->i_rdev));

			ri->i_addr[1] =

				cpu_to_le32(new_encode_dev(inode->i_rdev));

			ri->i_addr[2] = 0;

		}

	}

fs/f2fs/recovery.c

+6 −6
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ static int recover_dentry(struct page *ipage, struct inode *inode) 
	kunmap(page);

	f2fs_put_page(page, 0);

out:

	f2fs_msg(inode->i_sb, KERN_NOTICE, "recover_inode and its dentry: "

			"ino = %x, name = %s, dir = %lx, err = %d",

			ino_of_node(ipage), raw_inode->i_name,

	f2fs_msg(inode->i_sb, KERN_NOTICE,

			"%s: ino = %x, name = %s, dir = %lx, err = %d",

			__func__, ino_of_node(ipage), raw_inode->i_name,

			IS_ERR(dir) ? 0 : dir->i_ino, err);

	return err;

}
@@ -366,8 +366,8 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, 
	f2fs_put_dnode(&dn);

	f2fs_unlock_op(sbi);

out:

	f2fs_msg(sbi->sb, KERN_NOTICE, "recover_data: ino = %lx, "

			"recovered_data = %d blocks, err = %d",

	f2fs_msg(sbi->sb, KERN_NOTICE,

		"recover_data: ino = %lx, recovered = %d blocks, err = %d",

		inode->i_ino, recovered, err);

	return err;

}