Commit 5f029c04 authored by Yi Zhuang's avatar Yi Zhuang Committed by Jaegeuk Kim
Browse files

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: default avatarYi Zhuang <zhuangyi1@huawei.com>
Signed-off-by: default avatarJia Yang <jiayang5@huawei.com>
Signed-off-by: default avatarJack Qiu <jack.qiu@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent c35b8d5e

fs/f2fs/acl.c

+1 −0
Original line number Diff line number Diff line
@@ -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) {

fs/f2fs/checkpoint.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

fs/f2fs/data.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

fs/f2fs/debug.c

+3 −0
Original line number Diff line number Diff line
@@ -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 @@ static void update_mem_info(struct f2fs_sb_info *sbi) 
	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;

	}

}

fs/f2fs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -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);