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

Commit 1cd14caf authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: update file name in the inode block during f2fs_rename 



The error is reproducible by:
0. mkfs.f2fs /dev/sdb1 & mount
1. touch test1
2. touch test2
3. mv test1 test2
4. umount
5. dumpt.f2fs -i 4 /dev/sdb1

After this, when we retrieve the inode->i_name of test2 by dump.f2fs, we get
test1 instead of test2.
This is because f2fs didn't update the file name during the f2fs_rename.

So, this patch fixes that.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 45590710

fs/f2fs/dir.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -276,6 +276,21 @@ static void init_dent_inode(const struct qstr *name, struct page *ipage) 
	set_page_dirty(ipage);

	set_page_dirty(ipage);

}

}





int update_dent_inode(struct inode *inode, const struct qstr *name)

{

	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);

	struct page *page;



	page = get_node_page(sbi, inode->i_ino);

	if (IS_ERR(page))

		return PTR_ERR(page);



	init_dent_inode(name, page);

	f2fs_put_page(page, 1);



	return 0;

}



static int make_empty_dir(struct inode *inode,

static int make_empty_dir(struct inode *inode,

		struct inode *parent, struct page *page)

		struct inode *parent, struct page *page)

{

{

fs/f2fs/f2fs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -953,6 +953,7 @@ struct f2fs_dir_entry *f2fs_parent_dir(struct inode *, struct page **); 
ino_t f2fs_inode_by_name(struct inode *, struct qstr *);

ino_t f2fs_inode_by_name(struct inode *, struct qstr *);

void f2fs_set_link(struct inode *, struct f2fs_dir_entry *,

void f2fs_set_link(struct inode *, struct f2fs_dir_entry *,

				struct page *, struct inode *);

				struct page *, struct inode *);

int update_dent_inode(struct inode *, const struct qstr *);

int __f2fs_add_link(struct inode *, const struct qstr *, struct inode *);

int __f2fs_add_link(struct inode *, const struct qstr *, struct inode *);

void f2fs_delete_entry(struct f2fs_dir_entry *, struct page *, struct inode *);

void f2fs_delete_entry(struct f2fs_dir_entry *, struct page *, struct inode *);

int f2fs_make_empty(struct inode *, struct inode *);

int f2fs_make_empty(struct inode *, struct inode *);

fs/f2fs/namei.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -427,6 +427,11 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		if (!new_entry)

		if (!new_entry)

			goto out_dir;

			goto out_dir;





		if (update_dent_inode(old_inode, &new_dentry->d_name)) {

			f2fs_put_page(new_page, 1);

			goto out_dir;

		}



		f2fs_set_link(new_dir, new_entry, new_page, old_inode);

		f2fs_set_link(new_dir, new_entry, new_page, old_inode);





		new_inode->i_ctime = CURRENT_TIME;

		new_inode->i_ctime = CURRENT_TIME;