Unverified Commit 6c173ff8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12998 f2fs: get rid of online repaire on corrupted directory 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MLQ5ZCBVAI77LKDZG6YWG3S3H47DKMNA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYPKA 
 
Link:https://gitee.com/openeuler/kernel/pulls/12998

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 7435f796 e1148037

fs/f2fs/f2fs.h

+0 −11
Original line number Diff line number Diff line
@@ -672,7 +672,6 @@ enum { 
	FI_FIRST_BLOCK_WRITTEN,	/* indicate #0 data block was written */

	FI_DROP_CACHE,		/* drop dirty page cache */

	FI_DATA_EXIST,		/* indicate data exists */

	FI_INLINE_DOTS,		/* indicate inline dot dentries */

	FI_DO_DEFRAG,		/* indicate defragment is running */

	FI_DIRTY_FILE,		/* indicate regular/symlink has dirty pages */

	FI_NO_PREALLOC,		/* indicate skipped preallocated blocks */
@@ -2632,7 +2631,6 @@ static inline void __mark_inode_dirty_flag(struct inode *inode, 
			return;

		fallthrough;

	case FI_DATA_EXIST:

	case FI_INLINE_DOTS:

	case FI_PIN_FILE:

		f2fs_mark_inode_dirty_sync(inode, true);

	}
@@ -2749,8 +2747,6 @@ static inline void get_inline_info(struct inode *inode, struct f2fs_inode *ri) 
		set_bit(FI_INLINE_DENTRY, fi->flags);

	if (ri->i_inline & F2FS_DATA_EXIST)

		set_bit(FI_DATA_EXIST, fi->flags);

	if (ri->i_inline & F2FS_INLINE_DOTS)

		set_bit(FI_INLINE_DOTS, fi->flags);

	if (ri->i_inline & F2FS_EXTRA_ATTR)

		set_bit(FI_EXTRA_ATTR, fi->flags);

	if (ri->i_inline & F2FS_PIN_FILE)
@@ -2769,8 +2765,6 @@ static inline void set_raw_inline(struct inode *inode, struct f2fs_inode *ri) 
		ri->i_inline |= F2FS_INLINE_DENTRY;

	if (is_inode_flag_set(inode, FI_DATA_EXIST))

		ri->i_inline |= F2FS_DATA_EXIST;

	if (is_inode_flag_set(inode, FI_INLINE_DOTS))

		ri->i_inline |= F2FS_INLINE_DOTS;

	if (is_inode_flag_set(inode, FI_EXTRA_ATTR))

		ri->i_inline |= F2FS_EXTRA_ATTR;

	if (is_inode_flag_set(inode, FI_PIN_FILE))
@@ -2835,11 +2829,6 @@ static inline int f2fs_exist_data(struct inode *inode) 
	return is_inode_flag_set(inode, FI_DATA_EXIST);

}



static inline int f2fs_has_inline_dots(struct inode *inode)

{

	return is_inode_flag_set(inode, FI_INLINE_DOTS);

}



static inline int f2fs_is_mmap_file(struct inode *inode)

{

	return is_inode_flag_set(inode, FI_MMAP_FILE);

fs/f2fs/namei.c

+0 −62
Original line number Diff line number Diff line
@@ -440,56 +440,6 @@ struct dentry *f2fs_get_parent(struct dentry *child) 
	return d_obtain_alias(f2fs_iget(child->d_sb, ino));

}



static int __recover_dot_dentries(struct inode *dir, nid_t pino)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);

	struct qstr dot = QSTR_INIT(".", 1);

	struct qstr dotdot = QSTR_INIT("..", 2);

	struct f2fs_dir_entry *de;

	struct page *page;

	int err = 0;



	if (f2fs_readonly(sbi->sb)) {

		f2fs_info(sbi, "skip recovering inline_dots inode (ino:%lu, pino:%u) in readonly mountpoint",

			  dir->i_ino, pino);

		return 0;

	}



	err = dquot_initialize(dir);

	if (err)

		return err;



	f2fs_balance_fs(sbi, true);



	f2fs_lock_op(sbi);



	de = f2fs_find_entry(dir, &dot, &page);

	if (de) {

		f2fs_put_page(page, 0);

	} else if (IS_ERR(page)) {

		err = PTR_ERR(page);

		goto out;

	} else {

		err = f2fs_do_add_link(dir, &dot, NULL, dir->i_ino, S_IFDIR);

		if (err)

			goto out;

	}



	de = f2fs_find_entry(dir, &dotdot, &page);

	if (de)

		f2fs_put_page(page, 0);

	else if (IS_ERR(page))

		err = PTR_ERR(page);

	else

		err = f2fs_do_add_link(dir, &dotdot, NULL, pino, S_IFDIR);

out:

	if (!err)

		clear_inode_flag(dir, FI_INLINE_DOTS);



	f2fs_unlock_op(sbi);

	return err;

}



static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,

		unsigned int flags)

{
@@ -499,7 +449,6 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, 
	struct dentry *new;

	nid_t ino = -1;

	int err = 0;

	unsigned int root_ino = F2FS_ROOT_INO(F2FS_I_SB(dir));

	struct f2fs_filename fname;



	trace_f2fs_lookup_start(dir, dentry, flags);
@@ -535,17 +484,6 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, 
		goto out;

	}



	if ((dir->i_ino == root_ino) && f2fs_has_inline_dots(dir)) {

		err = __recover_dot_dentries(dir, root_ino);

		if (err)

			goto out_iput;

	}



	if (f2fs_has_inline_dots(inode)) {

		err = __recover_dot_dentries(inode, dir->i_ino);

		if (err)

			goto out_iput;

	}

	if (IS_ENCRYPTED(dir) &&

	    (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&

	    !fscrypt_has_permitted_context(dir, inode)) {

include/linux/f2fs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ struct f2fs_extent { 
#define F2FS_INLINE_DATA	0x02	/* file inline data flag */

#define F2FS_INLINE_DENTRY	0x04	/* file inline dentry flag */

#define F2FS_DATA_EXIST		0x08	/* file inline data exist flag */

#define F2FS_INLINE_DOTS	0x10	/* file having implicit dot dentries */

#define F2FS_INLINE_DOTS	0x10	/* file having implicit dot dentries (obsolete) */

#define F2FS_EXTRA_ATTR		0x20	/* file having extra attribute */

#define F2FS_PIN_FILE		0x40	/* file should not be gced */