Revert "f2fs: fix potential corruption when moving a directory"

commit cde3c9d7e2a359e337216855dcb333a19daaa436 upstream.

This reverts commit d94772154e524b329a168678836745d2773a6e02. 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index d879a29..bd020a9 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -1002,20 +1002,12 @@ static int f2fs_rename(struct user_namespace *mnt_userns, 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)) {
@@ -1123,9 +1115,6 @@ static int f2fs_rename(struct user_namespace *mnt_userns, 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);
 
@@ -1140,9 +1129,6 @@ out_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;