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

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

f2fs: avoid to set wrong pino of inode when rename dir 



When we rename a dir to new name which is not exist previous,
we will set pino of parent inode with ino of child inode in f2fs_set_link.
It destroy consistency of pino, it should be fixed.

Thanks for previous work of Shu Tan.

Signed-off-by: default avatarShu Tan <shu.tan@samsung.com>
Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 4f4124d0

fs/f2fs/dir.c

+0 −3
Original line number Diff line number Diff line
@@ -259,9 +259,6 @@ void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de, 
	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

	mark_inode_dirty(dir);



	/* update parent inode number before releasing dentry page */

	F2FS_I(inode)->i_pino = dir->i_ino;



	f2fs_put_page(page, 1);

}

fs/f2fs/namei.c

+2 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		}



		f2fs_set_link(new_dir, new_entry, new_page, old_inode);

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



		new_inode->i_ctime = CURRENT_TIME;

		if (old_dir_entry)
@@ -457,6 +458,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		if (old_dir != new_dir) {

			f2fs_set_link(old_inode, old_dir_entry,

						old_dir_page, new_dir);

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

		} else {

			kunmap(old_dir_page);

			f2fs_put_page(old_dir_page, 0);