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

Commit 9850cf4a authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: need fsck.f2fs when f2fs_bug_on is triggered 



If any f2fs_bug_on is triggered, fsck.f2fs is needed.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 2ae4c673

fs/f2fs/checkpoint.c

+3 −3
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ int acquire_orphan_inode(struct f2fs_sb_info *sbi) 
void release_orphan_inode(struct f2fs_sb_info *sbi)

{

	spin_lock(&sbi->ino_lock[ORPHAN_INO]);

	f2fs_bug_on(sbi->n_orphans == 0);

	f2fs_bug_on(sbi, sbi->n_orphans == 0);

	sbi->n_orphans--;

	spin_unlock(&sbi->ino_lock[ORPHAN_INO]);

}
@@ -394,7 +394,7 @@ void remove_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) 
static void recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)

{

	struct inode *inode = f2fs_iget(sbi->sb, ino);

	f2fs_bug_on(IS_ERR(inode));

	f2fs_bug_on(sbi, IS_ERR(inode));

	clear_nlink(inode);



	/* truncate all the data during iput */
@@ -455,7 +455,7 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) 
	list_for_each_entry(orphan, head, list) {

		if (!page) {

			page = find_get_page(META_MAPPING(sbi), start_blk++);

			f2fs_bug_on(!page);

			f2fs_bug_on(sbi, !page);

			orphan_blk =

				(struct f2fs_orphan_block *)page_address(page);

			memset(orphan_blk, 0, sizeof(*orphan_blk));

fs/f2fs/data.c

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index) 
	int err;



	/* if inode_page exists, index should be zero */

	f2fs_bug_on(!need_put && index);

	f2fs_bug_on(F2FS_I_SB(dn->inode), !need_put && index);



	err = get_dnode_of_data(dn, index, ALLOC_NODE);

	if (err)
@@ -321,7 +321,7 @@ void update_extent_cache(block_t blk_addr, struct dnode_of_data *dn) 
	block_t start_blkaddr, end_blkaddr;

	int need_update = true;



	f2fs_bug_on(blk_addr == NEW_ADDR);

	f2fs_bug_on(F2FS_I_SB(dn->inode), blk_addr == NEW_ADDR);

	fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +

							dn->ofs_in_node;

fs/f2fs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static struct f2fs_dir_entry *find_in_block(struct page *dentry_page, 
		 * For the most part, it should be a bug when name_len is zero.

		 * We stop here for figuring out where the bugs has occurred.

		 */

		f2fs_bug_on(!de->name_len);

		f2fs_bug_on(F2FS_P_SB(dentry_page), !de->name_len);



		bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));

	}
@@ -151,7 +151,7 @@ static struct f2fs_dir_entry *find_in_level(struct inode *dir, 
	bool room = false;

	int max_slots = 0;



	f2fs_bug_on(level > MAX_DIR_HASH_DEPTH);

	f2fs_bug_on(F2FS_I_SB(dir), level > MAX_DIR_HASH_DEPTH);



	nbucket = dir_buckets(level, F2FS_I(dir)->i_dir_level);

	nblock = bucket_blocks(level);

fs/f2fs/f2fs.h

+16 −10
Original line number Diff line number Diff line
@@ -21,10 +21,16 @@ 
#include <linux/sched.h>



#ifdef CONFIG_F2FS_CHECK_FS

#define f2fs_bug_on(condition)	BUG_ON(condition)

#define f2fs_bug_on(sbi, condition)	BUG_ON(condition)

#define f2fs_down_write(x, y)	down_write_nest_lock(x, y)

#else

#define f2fs_bug_on(condition)	WARN_ON(condition)

#define f2fs_bug_on(sbi, condition)					\

	do {								\

		if (unlikely(condition)) {				\

			WARN_ON(1);					\

			sbi->need_fsck = true;				\

		}							\

	} while (0)

#define f2fs_down_write(x, y)	down_write(x)

#endif
@@ -719,8 +725,8 @@ static inline void dec_valid_block_count(struct f2fs_sb_info *sbi, 
						blkcnt_t count)

{

	spin_lock(&sbi->stat_lock);

	f2fs_bug_on(sbi->total_valid_block_count < (block_t) count);

	f2fs_bug_on(inode->i_blocks < count);

	f2fs_bug_on(sbi, sbi->total_valid_block_count < (block_t) count);

	f2fs_bug_on(sbi, inode->i_blocks < count);

	inode->i_blocks -= count;

	sbi->total_valid_block_count -= (block_t)count;

	spin_unlock(&sbi->stat_lock);
@@ -864,9 +870,9 @@ static inline void dec_valid_node_count(struct f2fs_sb_info *sbi, 
{

	spin_lock(&sbi->stat_lock);



	f2fs_bug_on(!sbi->total_valid_block_count);

	f2fs_bug_on(!sbi->total_valid_node_count);

	f2fs_bug_on(!inode->i_blocks);

	f2fs_bug_on(sbi, !sbi->total_valid_block_count);

	f2fs_bug_on(sbi, !sbi->total_valid_node_count);

	f2fs_bug_on(sbi, !inode->i_blocks);



	inode->i_blocks--;

	sbi->total_valid_node_count--;
@@ -883,7 +889,7 @@ static inline unsigned int valid_node_count(struct f2fs_sb_info *sbi) 
static inline void inc_valid_inode_count(struct f2fs_sb_info *sbi)

{

	spin_lock(&sbi->stat_lock);

	f2fs_bug_on(sbi->total_valid_inode_count == sbi->total_node_count);

	f2fs_bug_on(sbi, sbi->total_valid_inode_count == sbi->total_node_count);

	sbi->total_valid_inode_count++;

	spin_unlock(&sbi->stat_lock);

}
@@ -891,7 +897,7 @@ static inline void inc_valid_inode_count(struct f2fs_sb_info *sbi) 
static inline void dec_valid_inode_count(struct f2fs_sb_info *sbi)

{

	spin_lock(&sbi->stat_lock);

	f2fs_bug_on(!sbi->total_valid_inode_count);

	f2fs_bug_on(sbi, !sbi->total_valid_inode_count);

	sbi->total_valid_inode_count--;

	spin_unlock(&sbi->stat_lock);

}
@@ -907,7 +913,7 @@ static inline void f2fs_put_page(struct page *page, int unlock) 
		return;



	if (unlock) {

		f2fs_bug_on(!PageLocked(page));

		f2fs_bug_on(F2FS_P_SB(page), !PageLocked(page));

		unlock_page(page);

	}

	page_cache_release(page);

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ int truncate_blocks(struct inode *inode, u64 from, bool lock) 
	count = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode));



	count -= dn.ofs_in_node;

	f2fs_bug_on(count < 0);

	f2fs_bug_on(sbi, count < 0);



	if (dn.ofs_in_node || IS_INODE(dn.node_page)) {

		truncate_data_blocks_range(&dn, count);