f2fs: convert inline_dir early before starting rename
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: convert inline_dir early before starting rename
If we hit an error during rename, we'll get two dentries in different directories.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/f2fs.h | 1 + fs/f2fs/inline.c | 30 ++++++++++++++++++++++++++++-- fs/f2fs/namei.c | 36 +++++++++++++----------------------- 3 files changed, 42 insertions(+), 25 deletions(-)
fs/f2fs/f2fs.h +1 -0
@@ -3490,6 +3490,7 @@ void f2fs_truncate_inline_inode(struct inode *inode,int f2fs_read_inline_data (struct inode *inode,struct page *page);int f2fs_convert_inline_page (struct dnode_of_data *dn,struct page *page);int f2fs_convert_inline_inode (struct inode *inode); +int f2fs_convert_inline_dir (struct inode *dir);int f2fs_write_inline_data (struct inode *inode,struct page *page);bool f2fs_recover_inline_data (struct inode *inode,struct page *npage); struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,
fs/f2fs/inline.c +28 -2
@@ -530,7 +530,7 @@ static int f2fs_move_rehashed_dirents(struct inode *dir, struct page *ipage,return err; } -static int f2fs_convert_inline_dir (struct inode *dir,struct page *ipage, +static int do_convert_inline_dir (struct inode *dir,struct page *ipage,void *inline_dentry) {if (!F2FS_I (dir)->i_dir_level)
@@ -539,6 +539,32 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,return f2fs_move_rehashed_dirents (dir, ipage, inline_dentry); } +int f2fs_convert_inline_dir (struct inode *dir) +{ +struct f2fs_sb_info *sbi =F2FS_I_SB (dir); +struct page *ipage; +void *inline_dentry =NULL ; +int err; + +if (!f2fs_has_inline_dentry (dir)) +return 0 ; + +f2fs_lock_op (sbi); + + ipage =f2fs_get_node_page (sbi, dir->i_ino); +if (IS_ERR (ipage)) +return PTR_ERR (ipage); + + inline_dentry =inline_data_addr (dir, ipage); + + err =do_convert_inline_dir (dir, ipage, inline_dentry); +if (!err) +f2fs_put_page (ipage,1 ); + +f2fs_unlock_op (sbi); +return err; +} +int f2fs_add_inline_entry (struct inode *dir,const struct qstr *new_name,const struct qstr *orig_name,struct inode *inode,nid_t ino,umode_t mode)
@@ -562,7 +588,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *new_name, bit_pos =f2fs_room_for_filename (d.bitmap, slots, d.max);if (bit_pos >= d.max) { - err =f2fs_convert_inline_dir (dir, ipage, inline_dentry); + err =do_convert_inline_dir (dir, ipage, inline_dentry);if (err)return err; err = -EAGAIN ;
fs/f2fs/namei.c +13 -23
@@ -855,7 +855,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,struct f2fs_dir_entry *old_dir_entry =NULL ;struct f2fs_dir_entry *old_entry;struct f2fs_dir_entry *new_entry; -bool is_old_inline =f2fs_has_inline_dentry (old_dir);int err;if (unlikely (f2fs_cp_error (sbi)))
@@ -868,6 +867,19 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, F2FS_I(old_dentry->d_inode)->i_projid)))return -EXDEV ; +/* +* old entry and new entry can locate in the same inline +* dentry in inode, when attaching new entry in inline dentry, +* it could force inline dentry conversion, after that, +* old_entry and old_page will point to wrong address, in +* order to avoid this, let's do the check and update here. +*/ +if (old_dir == new_dir && !new_inode) { + err =f2fs_convert_inline_dir (old_dir); +if (err) +return err; + } +if (flags &RENAME_WHITEOUT ) { err =f2fs_create_whiteout (old_dir, &whiteout);if (err)
@@ -954,28 +966,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,if (old_dir_entry)f2fs_i_links_write (new_dir, true); - -/* -* old entry and new entry can locate in the same inline -* dentry in inode, when attaching new entry in inline dentry, -* it could force inline dentry conversion, after that, -* old_entry and old_page will point to wrong address, in -* order to avoid this, let's do the check and update here. -*/ -if (is_old_inline && !f2fs_has_inline_dentry (old_dir)) { -f2fs_put_page (old_page,0 ); - old_page =NULL ; - - old_entry =f2fs_find_entry (old_dir, - &old_dentry->d_name, &old_page); -if (!old_entry) { - err = -ENOENT ; -if (IS_ERR (old_page)) - err =PTR_ERR (old_page); -f2fs_unlock_op (sbi); - goto out_dir; - } - } }down_write (&F2FS_I (old_inode)->i_sem);
Signature · 1 line
2.24.0.525.g8f36a354ae-goog