Skip to content

Commit

Permalink
Revert "f2fs: fix potential corruption when moving a directory"
Browse files Browse the repository at this point in the history
This reverts commit d947721. The
locking is going to be provided by VFS.

CC: Jaegeuk Kim <jaegeuk@kernel.org>
CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Message-Id: <20230601105830.13168-3-jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
  • Loading branch information
Jan Kara authored and Christian Brauner committed Jun 2, 2023
1 parent 7517ce5 commit cde3c9d
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions fs/f2fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -995,20 +995,12 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
goto out;
}

/*
* Copied from ext4_rename: we need to protect against old.inode
* directory getting converted from inline directory format into
* a normal one.
*/
if (S_ISDIR(old_inode->i_mode))
inode_lock_nested(old_inode, I_MUTEX_NONDIR2);

err = -ENOENT;
old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);
if (!old_entry) {
if (IS_ERR(old_page))
err = PTR_ERR(old_page);
goto out_unlock_old;
goto out;
}

if (S_ISDIR(old_inode->i_mode)) {
Expand Down Expand Up @@ -1116,9 +1108,6 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,

f2fs_unlock_op(sbi);

if (S_ISDIR(old_inode->i_mode))
inode_unlock(old_inode);

if (IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir))
f2fs_sync_fs(sbi->sb, 1);

Expand All @@ -1133,9 +1122,6 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
f2fs_put_page(old_dir_page, 0);
out_old:
f2fs_put_page(old_page, 0);
out_unlock_old:
if (S_ISDIR(old_inode->i_mode))
inode_unlock(old_inode);
out:
iput(whiteout);
return err;
Expand Down

0 comments on commit cde3c9d

Please sign in to comment.