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

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
...@@ -792,7 +792,7 @@ static int f2fs_write_data_page(struct page *page, ...@@ -792,7 +792,7 @@ static int f2fs_write_data_page(struct page *page,
int err = 0; int err = 0;
struct f2fs_io_info fio = { struct f2fs_io_info fio = {
.type = DATA, .type = DATA,
.rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC: WRITE, .rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE,
}; };
if (page->index < end_index) if (page->index < end_index)
......
...@@ -245,7 +245,7 @@ static int stat_show(struct seq_file *s, void *v) ...@@ -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, " - node blocks : %d\n", si->node_blks);
seq_printf(s, "\nExtent Hit Ratio: %d / %d\n", seq_printf(s, "\nExtent Hit Ratio: %d / %d\n",
si->hit_ext, si->total_ext); 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", seq_printf(s, " - nodes: %4d in %4d\n",
si->ndirty_node, si->node_pages); si->ndirty_node, si->node_pages);
seq_printf(s, " - dents: %4d in dirs:%4d\n", seq_printf(s, " - dents: %4d in dirs:%4d\n",
......
...@@ -430,7 +430,8 @@ static int room_for_filename(struct f2fs_dentry_block *dentry_blk, int slots) ...@@ -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 * Caller should grab and release a rwsem by calling f2fs_lock_op() and
* f2fs_unlock_op(). * 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 bit_pos;
unsigned int level; unsigned int level;
...@@ -631,7 +632,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) ...@@ -631,7 +632,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
bit_pos = ((unsigned long)ctx->pos % NR_DENTRY_IN_BLOCK); bit_pos = ((unsigned long)ctx->pos % NR_DENTRY_IN_BLOCK);
for ( ; n < npages; n++) { for (; n < npages; n++) {
dentry_page = get_lock_data_page(inode, n); dentry_page = get_lock_data_page(inode, n);
if (IS_ERR(dentry_page)) if (IS_ERR(dentry_page))
continue; continue;
......
...@@ -607,9 +607,9 @@ static inline int check_nid_range(struct f2fs_sb_info *sbi, nid_t nid) ...@@ -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) static inline int F2FS_HAS_BLOCKS(struct inode *inode)
{ {
if (F2FS_I(inode)->i_xattr_nid) 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 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, static inline bool inc_valid_block_count(struct f2fs_sb_info *sbi,
...@@ -1231,7 +1231,7 @@ struct f2fs_stat_info { ...@@ -1231,7 +1231,7 @@ struct f2fs_stat_info {
static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi) static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)
{ {
return (struct f2fs_stat_info*)sbi->stat_info; return (struct f2fs_stat_info *)sbi->stat_info;
} }
#define stat_inc_call_count(si) ((si)->call_count++) #define stat_inc_call_count(si) ((si)->call_count++)
......
...@@ -202,7 +202,7 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count) ...@@ -202,7 +202,7 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count)
raw_node = F2FS_NODE(dn->node_page); raw_node = F2FS_NODE(dn->node_page);
addr = blkaddr_in_node(raw_node) + ofs; addr = blkaddr_in_node(raw_node) + ofs;
for ( ; count > 0; count--, addr++, dn->ofs_in_node++) { for (; count > 0; count--, addr++, dn->ofs_in_node++) {
block_t blkaddr = le32_to_cpu(*addr); block_t blkaddr = le32_to_cpu(*addr);
if (blkaddr == NULL_ADDR) if (blkaddr == NULL_ADDR)
continue; continue;
......
...@@ -42,9 +42,11 @@ static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri) ...@@ -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) || if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||
S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) { S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {
if (ri->i_addr[0]) 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 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) ...@@ -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 (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) {
if (old_valid_dev(inode->i_rdev)) { 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; ri->i_addr[1] = 0;
} else { } else {
ri->i_addr[0] = 0; 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; ri->i_addr[2] = 0;
} }
} }
......
...@@ -1196,7 +1196,7 @@ static int f2fs_write_node_page(struct page *page, ...@@ -1196,7 +1196,7 @@ static int f2fs_write_node_page(struct page *page,
struct node_info ni; struct node_info ni;
struct f2fs_io_info fio = { struct f2fs_io_info fio = {
.type = NODE, .type = NODE,
.rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC: WRITE, .rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE,
}; };
if (unlikely(sbi->por_doing)) if (unlikely(sbi->por_doing))
......
...@@ -95,9 +95,9 @@ static int recover_dentry(struct page *ipage, struct inode *inode) ...@@ -95,9 +95,9 @@ static int recover_dentry(struct page *ipage, struct inode *inode)
kunmap(page); kunmap(page);
f2fs_put_page(page, 0); f2fs_put_page(page, 0);
out: out:
f2fs_msg(inode->i_sb, KERN_NOTICE, "recover_inode and its dentry: " f2fs_msg(inode->i_sb, KERN_NOTICE,
"ino = %x, name = %s, dir = %lx, err = %d", "%s: ino = %x, name = %s, dir = %lx, err = %d",
ino_of_node(ipage), raw_inode->i_name, __func__, ino_of_node(ipage), raw_inode->i_name,
IS_ERR(dir) ? 0 : dir->i_ino, err); IS_ERR(dir) ? 0 : dir->i_ino, err);
return err; return err;
} }
...@@ -366,8 +366,8 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, ...@@ -366,8 +366,8 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
f2fs_put_dnode(&dn); f2fs_put_dnode(&dn);
f2fs_unlock_op(sbi); f2fs_unlock_op(sbi);
out: out:
f2fs_msg(sbi->sb, KERN_NOTICE, "recover_data: ino = %lx, " f2fs_msg(sbi->sb, KERN_NOTICE,
"recovered_data = %d blocks, err = %d", "recover_data: ino = %lx, recovered = %d blocks, err = %d",
inode->i_ino, recovered, err); inode->i_ino, recovered, err);
return err; return err;
} }
......
...@@ -946,7 +946,8 @@ void write_data_page(struct page *page, struct dnode_of_data *dn, ...@@ -946,7 +946,8 @@ void write_data_page(struct page *page, struct dnode_of_data *dn,
do_write_page(sbi, page, dn->data_blkaddr, new_blkaddr, &sum, fio); do_write_page(sbi, page, dn->data_blkaddr, new_blkaddr, &sum, fio);
} }
void rewrite_data_page(struct page *page, block_t old_blkaddr, struct f2fs_io_info *fio) void rewrite_data_page(struct page *page, block_t old_blkaddr,
struct f2fs_io_info *fio)
{ {
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
...@@ -1647,7 +1648,8 @@ static void build_sit_entries(struct f2fs_sb_info *sbi) ...@@ -1647,7 +1648,8 @@ static void build_sit_entries(struct f2fs_sb_info *sbi)
mutex_lock(&curseg->curseg_mutex); mutex_lock(&curseg->curseg_mutex);
for (i = 0; i < sits_in_cursum(sum); i++) { for (i = 0; i < sits_in_cursum(sum); i++) {
if (le32_to_cpu(segno_in_journal(sum, i)) == start) { if (le32_to_cpu(segno_in_journal(sum, i))
== start) {
sit = sit_in_journal(sum, i); sit = sit_in_journal(sum, i);
mutex_unlock(&curseg->curseg_mutex); mutex_unlock(&curseg->curseg_mutex);
goto got_it; goto got_it;
......
...@@ -448,8 +448,8 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi) ...@@ -448,8 +448,8 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi)
static inline bool need_SSR(struct f2fs_sb_info *sbi) static inline bool need_SSR(struct f2fs_sb_info *sbi)
{ {
return ((prefree_segments(sbi) / sbi->segs_per_sec) return (prefree_segments(sbi) / sbi->segs_per_sec)
+ free_sections(sbi) < overprovision_sections(sbi)); + free_sections(sbi) < overprovision_sections(sbi);
} }
static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi, int freed) static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi, int freed)
...@@ -460,18 +460,19 @@ static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi, int freed) ...@@ -460,18 +460,19 @@ static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi, int freed)
if (unlikely(sbi->por_doing)) if (unlikely(sbi->por_doing))
return false; return false;
return ((free_sections(sbi) + freed) <= (node_secs + 2 * dent_secs + return (free_sections(sbi) + freed) <= (node_secs + 2 * dent_secs +
reserved_sections(sbi))); reserved_sections(sbi));
} }
static inline bool excess_prefree_segs(struct f2fs_sb_info *sbi) static inline bool excess_prefree_segs(struct f2fs_sb_info *sbi)
{ {
return (prefree_segments(sbi) > SM_I(sbi)->rec_prefree_segments); return prefree_segments(sbi) > SM_I(sbi)->rec_prefree_segments;
} }
static inline int utilization(struct f2fs_sb_info *sbi) static inline int utilization(struct f2fs_sb_info *sbi)
{ {
return div_u64((u64)valid_user_blocks(sbi) * 100, sbi->user_block_count); return div_u64((u64)valid_user_blocks(sbi) * 100,
sbi->user_block_count);
} }
/* /*
......
...@@ -535,7 +535,8 @@ static int segment_info_seq_show(struct seq_file *seq, void *offset) ...@@ -535,7 +535,8 @@ static int segment_info_seq_show(struct seq_file *seq, void *offset)
{ {
struct super_block *sb = seq->private; struct super_block *sb = seq->private;
struct f2fs_sb_info *sbi = F2FS_SB(sb); struct f2fs_sb_info *sbi = F2FS_SB(sb);
unsigned int total_segs = le32_to_cpu(sbi->raw_super->segment_count_main); unsigned int total_segs =
le32_to_cpu(sbi->raw_super->segment_count_main);
int i; int i;
for (i = 0; i < total_segs; i++) { for (i = 0; i < total_segs; i++) {
...@@ -816,8 +817,9 @@ static int read_raw_super_block(struct super_block *sb, ...@@ -816,8 +817,9 @@ static int read_raw_super_block(struct super_block *sb,
/* sanity checking of raw super */ /* sanity checking of raw super */
if (sanity_check_raw_super(sb, *raw_super)) { if (sanity_check_raw_super(sb, *raw_super)) {
brelse(*raw_super_buf); brelse(*raw_super_buf);
f2fs_msg(sb, KERN_ERR, "Can't find a valid F2FS filesystem " f2fs_msg(sb, KERN_ERR,
"in %dth superblock", block + 1); "Can't find valid F2FS filesystem in %dth superblock",
block + 1);
if (block == 0) { if (block == 0) {
block++; block++;
goto retry; goto retry;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment