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

Commit 82b14876 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix to update dir's i_pino during cross_rename 



As Eric reported:

RENAME_EXCHANGE support was just added to fsstress in xfstests:

	commit 65dfd40a97b6bbbd2a22538977bab355c5bc0f06
	Author: kaixuxia <xiakaixu1987@gmail.com>
	Date:   Thu Oct 31 14:41:48 2019 +0800

	    fsstress: add EXCHANGE renameat2 support

This is causing xfstest generic/579 to fail due to fsck.f2fs reporting errors.
I'm not sure what the problem is, but it still happens even with all the
fs-verity stuff in the test commented out, so that the test just runs fsstress.

generic/579 23s ... 	[10:02:25]
[    7.745370] run fstests generic/579 at 2019-11-04 10:02:25
_check_generic_filesystem: filesystem on /dev/vdc is inconsistent
(see /results/f2fs/results-default/generic/579.full for details)
 [10:02:47]
Ran: generic/579
Failures: generic/579
Failed 1 of 1 tests
Xunit report: /results/f2fs/results-default/result.xml

Here's the contents of 579.full:

_check_generic_filesystem: filesystem on /dev/vdc is inconsistent
*** fsck.f2fs output ***
[ASSERT] (__chk_dots_dentries:1378)  --> Bad inode number[0x24] for '..', parent parent ino is [0xd10]

The root cause is that we forgot to update directory's i_pino during
cross_rename, fix it.

Fixes: 32f9bc25 ("f2fs: support ->rename2()")
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Tested-by: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 254f00c4

fs/f2fs/namei.c

+12 −3
Original line number Original line Diff line number Diff line
@@ -981,7 +981,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (!old_dir_entry || whiteout)

	if (!old_dir_entry || whiteout)

		file_lost_pino(old_inode);

		file_lost_pino(old_inode);

	else

	else

		F2FS_I(old_inode)->i_pino = new_dir->i_ino;

		/* adjust dir's i_pino to pass fsck check */

		f2fs_i_pino_write(old_inode, new_dir->i_ino);

	up_write(&F2FS_I(old_inode)->i_sem);

	up_write(&F2FS_I(old_inode)->i_sem);





	old_inode->i_ctime = current_time(old_inode);

	old_inode->i_ctime = current_time(old_inode);
@@ -1141,7 +1142,11 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	f2fs_set_link(old_dir, old_entry, old_page, new_inode);

	f2fs_set_link(old_dir, old_entry, old_page, new_inode);





	down_write(&F2FS_I(old_inode)->i_sem);

	down_write(&F2FS_I(old_inode)->i_sem);

	if (!old_dir_entry)

		file_lost_pino(old_inode);

		file_lost_pino(old_inode);

	else

		/* adjust dir's i_pino to pass fsck check */

		f2fs_i_pino_write(old_inode, new_dir->i_ino);

	up_write(&F2FS_I(old_inode)->i_sem);

	up_write(&F2FS_I(old_inode)->i_sem);





	old_dir->i_ctime = current_time(old_dir);

	old_dir->i_ctime = current_time(old_dir);
@@ -1156,7 +1161,11 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	f2fs_set_link(new_dir, new_entry, new_page, old_inode);

	f2fs_set_link(new_dir, new_entry, new_page, old_inode);





	down_write(&F2FS_I(new_inode)->i_sem);

	down_write(&F2FS_I(new_inode)->i_sem);

	if (!new_dir_entry)

		file_lost_pino(new_inode);

		file_lost_pino(new_inode);

	else

		/* adjust dir's i_pino to pass fsck check */

		f2fs_i_pino_write(new_inode, old_dir->i_ino);

	up_write(&F2FS_I(new_inode)->i_sem);

	up_write(&F2FS_I(new_inode)->i_sem);





	new_dir->i_ctime = current_time(new_dir);

	new_dir->i_ctime = current_time(new_dir);