f2fs: clean up build warnings

This patch combined the below three clean-up patches.

- modify open brace '{' following function definitions
- ERROR: spaces required around that ':'
- ERROR: spaces required before the open parenthesis '('
- ERROR: spaces prohibited before that ','
- Made suggested modifications from checkpatch in reference to WARNING:
 Missing a blank line after declarations

Signed-off-by: Yi Zhuang <zhuangyi1@huawei.com>
Signed-off-by: Jia Yang <jiayang5@huawei.com>
Signed-off-by: Jack Qiu <jack.qiu@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index 965037a..239ad94 100644 (file)
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -29,6 +29,7 @@ static inline size_t f2fs_acl_size(int count)
 static inline int f2fs_acl_count(size_t size)
 {
        ssize_t s;
+
        size -= sizeof(struct f2fs_acl_header);
        s = size - 4 * sizeof(struct f2fs_acl_entry_short);
        if (s < 0) {

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index f616961..817d0bc 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -719,6 +719,7 @@ int f2fs_recover_orphan_inodes(struct f2fs_sb_info *sbi)
                orphan_blk = (struct f2fs_orphan_block *)page_address(page);
                for (j = 0; j < le32_to_cpu(orphan_blk->entry_count); j++) {
                        nid_t ino = le32_to_cpu(orphan_blk->ino[j]);
+
                        err = recover_orphan_inode(sbi, ino);
                        if (err) {
                                f2fs_put_page(page, 1);

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 4bf7e79..cf93547 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1086,6 +1086,7 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count)
 
        for (; count > 0; dn->ofs_in_node++) {
                block_t blkaddr = f2fs_data_blkaddr(dn);
+
                if (blkaddr == NULL_ADDR) {
                        dn->data_blkaddr = NEW_ADDR;
                        __set_data_blkaddr(dn);
@@ -3765,6 +3766,7 @@ int f2fs_migrate_page(struct address_space *mapping,
 
        if (atomic_written) {
                struct inmem_pages *cur;
+
                list_for_each_entry(cur, &fi->inmem_pages, list)
                        if (cur->page == page) {
                                cur->page = newpage;

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 91855d5..c03949a 100644 (file)
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -173,6 +173,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
        si->util_invalid = 50 - si->util_free - si->util_valid;
        for (i = CURSEG_HOT_DATA; i < NO_CHECK_TYPE; i++) {
                struct curseg_info *curseg = CURSEG_I(sbi, i);
+
                si->curseg[i] = curseg->segno;
                si->cursec[i] = GET_SEC_FROM_SEG(sbi, curseg->segno);
                si->curzone[i] = GET_ZONE_FROM_SEC(sbi, si->cursec[i]);
@@ -300,10 +301,12 @@ get_cache:
        si->page_mem = 0;
        if (sbi->node_inode) {
                unsigned npages = NODE_MAPPING(sbi)->nrpages;
+
                si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
        }
        if (sbi->meta_inode) {
                unsigned npages = META_MAPPING(sbi)->nrpages;
+
                si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
        }
 }

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index e6270a8..ebf65c5 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -473,6 +473,7 @@ void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de,
                struct page *page, struct inode *inode)
 {
        enum page_type type = f2fs_has_inline_dentry(dir) ? NODE : DATA;
+
        lock_page(page);
        f2fs_wait_on_page_writeback(page, type, true, true);
        de->ino = cpu_to_le32(inode->i_ino);

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index f3ca63b..d697c89 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -2582,7 +2582,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi,
 {
        struct inode *inode = file_inode(filp);
        struct f2fs_map_blocks map = { .m_next_extent = NULL,
-                                       .m_seg_type = NO_CHECK_TYPE ,
+                                       .m_seg_type = NO_CHECK_TYPE,
                                        .m_may_create = false };
        struct extent_info ei = {0, 0, 0};
        pgoff_t pg_start, pg_end, next_pgofs;

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 5c48825..8d1f17a 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -160,7 +160,7 @@ int f2fs_start_gc_thread(struct f2fs_sb_info *sbi)
        gc_th->max_sleep_time = DEF_GC_THREAD_MAX_SLEEP_TIME;
        gc_th->no_gc_sleep_time = DEF_GC_THREAD_NOGC_SLEEP_TIME;
 
-       gc_th->gc_wake= 0;
+       gc_th->gc_wake = 0;
 
        sbi->gc_thread = gc_th;
        init_waitqueue_head(&sbi->gc_thread->gc_wait_queue_head);
@@ -179,6 +179,7 @@ out:
 void f2fs_stop_gc_thread(struct f2fs_sb_info *sbi)
 {
        struct f2fs_gc_kthread *gc_th = sbi->gc_thread;
+
        if (!gc_th)
                return;
        kthread_stop(gc_th->f2fs_gc_task);
@@ -858,6 +859,7 @@ static void add_gc_inode(struct gc_inode_list *gc_list, struct inode *inode)
 static void put_gc_inode(struct gc_inode_list *gc_list)
 {
        struct inode_entry *ie, *next_ie;
+
        list_for_each_entry_safe(ie, next_ie, &gc_list->ilist, list) {
                radix_tree_delete(&gc_list->iroot, ie->inode->i_ino);
                iput(ie->inode);
@@ -982,9 +984,11 @@ block_t f2fs_start_bidx_of_node(unsigned int node_ofs, struct inode *inode)
                bidx = node_ofs - 1;
        } else if (node_ofs <= indirect_blks) {
                int dec = (node_ofs - 4) / (NIDS_PER_BLOCK + 1);
+
                bidx = node_ofs - 2 - dec;
        } else {
                int dec = (node_ofs - indirect_blks - 3) / (NIDS_PER_BLOCK + 1);
+
                bidx = node_ofs - 5 - dec;
        }
        return bidx * ADDRS_PER_BLOCK(inode) + ADDRS_PER_INODE(inode);

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 5d2253d..b401f08 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -666,6 +666,7 @@ retry:
        node_page = f2fs_get_node_page(sbi, inode->i_ino);
        if (IS_ERR(node_page)) {
                int err = PTR_ERR(node_page);
+
                if (err == -ENOMEM) {
                        cond_resched();
                        goto retry;

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 17bd072..405d85d 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -419,6 +419,7 @@ struct dentry *f2fs_get_parent(struct dentry *child)
        struct qstr dotdot = QSTR_INIT("..", 2);
        struct page *page;
        unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot, &page);
+
        if (!ino) {
                if (IS_ERR(page))
                        return ERR_CAST(page);
@@ -628,6 +629,7 @@ static const char *f2fs_get_link(struct dentry *dentry,
                                 struct delayed_call *done)
 {
        const char *link = page_get_link(dentry, inode, done);
+
        if (!IS_ERR(link) && !*link) {
                /* this is broken symlink case */
                do_delayed_call(done);
@@ -766,6 +768,7 @@ out_fail:
 static int f2fs_rmdir(struct inode *dir, struct dentry *dentry)
 {
        struct inode *inode = d_inode(dentry);
+
        if (f2fs_empty_dir(inode))
                return f2fs_unlink(dir, dentry);
        return -ENOTEMPTY;

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 3eb724b..e67ce5f 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -470,6 +470,7 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
        /* increment version no as node is removed */
        if (nat_get_blkaddr(e) != NEW_ADDR && new_blkaddr == NULL_ADDR) {
                unsigned char version = nat_get_version(e);
+
                nat_set_version(e, inc_node_version(version));
        }
 
@@ -1391,7 +1392,7 @@ repeat:
                goto out_err;
        }
 page_hit:
-       if(unlikely(nid != nid_of_node(page))) {
+       if (unlikely(nid != nid_of_node(page))) {
                f2fs_warn(sbi, "inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",
                          nid, nid_of_node(page), ino_of_node(page),
                          ofs_of_node(page), cpver_of_node(page),
@@ -1783,7 +1784,7 @@ continue_unlock:
 out:
        if (nwritten)
                f2fs_submit_merged_write_cond(sbi, NULL, NULL, ino, NODE);
-       return ret ? -EIO: 0;
+       return ret ? -EIO : 0;
 }
 
 static int f2fs_match_ino(struct inode *inode, unsigned long ino, void *data)
@@ -2125,8 +2126,8 @@ static int __insert_free_nid(struct f2fs_sb_info *sbi,
                                struct free_nid *i)
 {
        struct f2fs_nm_info *nm_i = NM_I(sbi);
-
        int err = radix_tree_insert(&nm_i->free_nid_root, i->nid, i);
+
        if (err)
                return err;
 
@@ -2991,6 +2992,7 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)
        while ((found = __gang_lookup_nat_set(nm_i,
                                        set_idx, SETVEC_SIZE, setvec))) {
                unsigned idx;
+
                set_idx = setvec[found - 1]->set + 1;
                for (idx = 0; idx < found; idx++)
                        __adjust_nat_entry_set(setvec[idx], &sets,

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index da75d5d..422146c 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -458,6 +458,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,
        /* Get the previous summary */
        for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) {
                struct curseg_info *curseg = CURSEG_I(sbi, i);
+
                if (curseg->segno == segno) {
                        sum = curseg->sum_blk->entries[blkoff];
                        goto got_it;
@@ -875,5 +876,5 @@ out:
 #endif
        sbi->sb->s_flags = s_flags; /* Restore SB_RDONLY status */
 
-       return ret ? ret: err;
+       return ret ? ret : err;
 }

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 5bd0e1d..0cb1ca8 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1794,7 +1794,7 @@ static int issue_discard_thread(void *data)
                if (issued > 0) {
                        __wait_all_discard_cmd(sbi, &dpolicy);
                        wait_ms = dpolicy.min_interval;
-               } else if (issued == -1){
+               } else if (issued == -1) {
                        wait_ms = f2fs_time_to_wait(sbi, DISCARD_TIME);
                        if (!wait_ms)
                                wait_ms = dpolicy.mid_interval;
@@ -2171,6 +2171,7 @@ static void __set_sit_entry_type(struct f2fs_sb_info *sbi, int type,
                                        unsigned int segno, int modified)
 {
        struct seg_entry *se = get_seg_entry(sbi, segno);
+
        se->type = type;
        if (modified)
                __mark_sit_entry_dirty(sbi, segno);
@@ -2362,6 +2363,7 @@ static void __add_sum_entry(struct f2fs_sb_info *sbi, int type,
 {
        struct curseg_info *curseg = CURSEG_I(sbi, type);
        void *addr = curseg->sum_blk;
+
        addr += curseg->next_blkoff * sizeof(struct f2fs_summary);
        memcpy(addr, sum, sizeof(struct f2fs_summary));
 }
@@ -3779,6 +3781,7 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi)
 
                for (j = 0; j < blk_off; j++) {
                        struct f2fs_summary *s;
+
                        s = (struct f2fs_summary *)(kaddr + offset);
                        seg_i->sum_blk->entries[j] = *s;
                        offset += SUMMARY_SIZE;
@@ -3841,6 +3844,7 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type)
                if (__exist_node_summaries(sbi)) {
                        struct f2fs_summary *ns = &sum->entries[0];
                        int i;
+
                        for (i = 0; i < sbi->blocks_per_seg; i++, ns++) {
                                ns->version = 0;
                                ns->ofs_in_node = 0;
@@ -3942,6 +3946,7 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)
        /* Step 3: write summary entries */
        for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) {
                unsigned short blkoff;
+
                seg_i = CURSEG_I(sbi, i);
                if (sbi->ckpt->alloc_type[i] == SSR)
                        blkoff = sbi->blocks_per_seg;
@@ -3978,6 +3983,7 @@ static void write_normal_summaries(struct f2fs_sb_info *sbi,
                                        block_t blkaddr, int type)
 {
        int i, end;
+
        if (IS_DATASEG(type))
                end = type + NR_CURSEG_DATA_TYPE;
        else
@@ -4561,6 +4567,7 @@ static void init_free_segmap(struct f2fs_sb_info *sbi)
        /* set use the current segments */
        for (type = CURSEG_HOT_DATA; type <= CURSEG_COLD_NODE; type++) {
                struct curseg_info *curseg_t = CURSEG_I(sbi, type);
+
                __set_test_and_inuse(sbi, curseg_t->segno);
        }
 }
@@ -4793,7 +4800,8 @@ static struct f2fs_dev_info *get_target_zoned_dev(struct f2fs_sb_info *sbi,
 }
 
 static int report_one_zone_cb(struct blk_zone *zone, unsigned int idx,
-                             void *data) {
+                             void *data)
+{
        memcpy(data, zone, sizeof(struct blk_zone));
        return 0;
 }
@@ -4909,8 +4917,10 @@ struct check_zone_write_pointer_args {
 };
 
 static int check_zone_write_pointer_cb(struct blk_zone *zone, unsigned int idx,
-                                     void *data) {
+                                     void *data)
+{
        struct check_zone_write_pointer_args *args;
+
        args = (struct check_zone_write_pointer_args *)data;
 
        return check_zone_write_pointer(args->sbi, args->fdev, zone);
@@ -5189,6 +5199,7 @@ static void discard_dirty_segmap(struct f2fs_sb_info *sbi,
 static void destroy_victim_secmap(struct f2fs_sb_info *sbi)
 {
        struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
+
        kvfree(dirty_i->victim_secmap);
 }
 
@@ -5233,6 +5244,7 @@ static void destroy_curseg(struct f2fs_sb_info *sbi)
 static void destroy_free_segmap(struct f2fs_sb_info *sbi)
 {
        struct free_segmap_info *free_i = SM_I(sbi)->free_info;
+
        if (!free_i)
                return;
        SM_I(sbi)->free_info = NULL;

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index c15800c..5020152 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -559,6 +559,7 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 
        while ((p = strsep(&options, ",")) != NULL) {
                int token;
+
                if (!*p)
                        continue;
                /*
@@ -1892,7 +1893,7 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi)
 
        ret = sync_filesystem(sbi->sb);
        if (ret || err) {
-               err = ret ? ret: err;
+               err = ret ? ret : err;
                goto restore_flag;
        }
 
@@ -3757,7 +3758,7 @@ try_onemore:
        sbi->iostat_period_ms = DEFAULT_IOSTAT_PERIOD_MS;
 
        for (i = 0; i < NR_PAGE_TYPE; i++) {
-               int n = (i == META) ? 1: NR_TEMP_TYPE;
+               int n = (i == META) ? 1 : NR_TEMP_TYPE;
                int j;
 
                sbi->write_io[i] =

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 490f843..c8f34de 100644 (file)
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -488,6 +488,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
                f2fs_wait_on_page_writeback(xpage, NODE, true, true);
        } else {
                struct dnode_of_data dn;
+
                set_new_dnode(&dn, inode, NULL, NULL, new_nid);
                xpage = f2fs_new_node_page(&dn, XATTR_NODE_OFFSET);
                if (IS_ERR(xpage)) {