From: Jan Kara <jack@suse.cz> To: Al Viro <viro@ZenIV.linux.org.uk> Cc: <linux-fsdevel@vger.kernel.org>, Christian Brauner <brauner@kernel.org>, Miklos Szeredi <miklos@szeredi.hu>, "Darrick J. Wong" <djwong@kernel.org>, Ted Tso <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org>, <linux-ext4@vger.kernel.org>, <linux-xfs@vger.kernel.org>, linux-f2fs-devel@lists.sourceforge.net, Jan Kara <jack@suse.cz>, stable@vger.kernel.org Subject: [PATCH v2 1/6] ext4: Remove ext4 locking of moved directory Date: Thu, 1 Jun 2023 12:58:21 +0200 [thread overview] Message-ID: <20230601105830.13168-1-jack@suse.cz> (raw) In-Reply-To: <20230601104525.27897-1-jack@suse.cz> Remove locking of moved directory in ext4_rename2(). We will take care of it in VFS instead. This effectively reverts commit 0813299c586b ("ext4: Fix possible corruption when moving a directory") and followup fixes. CC: Ted Tso <tytso@mit.edu> CC: stable@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/namei.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 45b579805c95..0caf6c730ce3 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3834,19 +3834,10 @@ static int ext4_rename(struct mnt_idmap *idmap, struct inode *old_dir, return retval; } - /* - * 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); - old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, &old.inlined); - if (IS_ERR(old.bh)) { - retval = PTR_ERR(old.bh); - goto unlock_moved_dir; - } + if (IS_ERR(old.bh)) + return PTR_ERR(old.bh); /* * Check for inode number is _not_ due to possible IO errors. @@ -4043,10 +4034,6 @@ static int ext4_rename(struct mnt_idmap *idmap, struct inode *old_dir, brelse(old.bh); brelse(new.bh); -unlock_moved_dir: - if (S_ISDIR(old.inode->i_mode)) - inode_unlock(old.inode); - return retval; } -- 2.35.3
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: Al Viro <viro@ZenIV.linux.org.uk> Cc: Christian Brauner <brauner@kernel.org>, Ted Tso <tytso@mit.edu>, Miklos Szeredi <miklos@szeredi.hu>, "Darrick J. Wong" <djwong@kernel.org>, Jan Kara <jack@suse.cz>, stable@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, linux-ext4@vger.kernel.org Subject: [f2fs-dev] [PATCH v2 1/6] ext4: Remove ext4 locking of moved directory Date: Thu, 1 Jun 2023 12:58:21 +0200 [thread overview] Message-ID: <20230601105830.13168-1-jack@suse.cz> (raw) In-Reply-To: <20230601104525.27897-1-jack@suse.cz> Remove locking of moved directory in ext4_rename2(). We will take care of it in VFS instead. This effectively reverts commit 0813299c586b ("ext4: Fix possible corruption when moving a directory") and followup fixes. CC: Ted Tso <tytso@mit.edu> CC: stable@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/namei.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 45b579805c95..0caf6c730ce3 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3834,19 +3834,10 @@ static int ext4_rename(struct mnt_idmap *idmap, struct inode *old_dir, return retval; } - /* - * 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); - old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, &old.inlined); - if (IS_ERR(old.bh)) { - retval = PTR_ERR(old.bh); - goto unlock_moved_dir; - } + if (IS_ERR(old.bh)) + return PTR_ERR(old.bh); /* * Check for inode number is _not_ due to possible IO errors. @@ -4043,10 +4034,6 @@ static int ext4_rename(struct mnt_idmap *idmap, struct inode *old_dir, brelse(old.bh); brelse(new.bh); -unlock_moved_dir: - if (S_ISDIR(old.inode->i_mode)) - inode_unlock(old.inode); - return retval; } -- 2.35.3 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2023-06-01 10:58 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-01 10:58 [PATCH v2 0/6] fs: Fix directory corruption when moving directories Jan Kara 2023-06-01 10:58 ` [f2fs-dev] " Jan Kara 2023-06-01 10:58 ` Jan Kara [this message] 2023-06-01 10:58 ` [f2fs-dev] [PATCH v2 1/6] ext4: Remove ext4 locking of moved directory Jan Kara 2023-06-01 14:52 ` Theodore Ts'o 2023-06-01 14:52 ` [f2fs-dev] " Theodore Ts'o 2023-06-01 15:27 ` Jan Kara 2023-06-01 15:27 ` Jan Kara 2023-06-01 15:58 ` Christian Brauner 2023-06-01 15:58 ` [f2fs-dev] " Christian Brauner 2023-06-01 10:58 ` [PATCH v2 2/6] Revert "udf: Protect rename against modification of moved directory" Jan Kara 2023-06-01 10:58 ` [f2fs-dev] " Jan Kara 2023-06-01 10:58 ` [PATCH v2 3/6] Revert "f2fs: fix potential corruption when moving a directory" Jan Kara 2023-06-01 10:58 ` [f2fs-dev] " Jan Kara 2023-06-01 10:58 ` [PATCH v2 4/6] fs: Establish locking order for unrelated directories Jan Kara 2023-06-01 10:58 ` [f2fs-dev] " Jan Kara 2023-06-01 13:58 ` Christian Brauner 2023-06-01 13:58 ` [f2fs-dev] " Christian Brauner 2023-06-01 15:24 ` Jan Kara 2023-06-01 15:24 ` [f2fs-dev] " Jan Kara 2023-06-01 15:37 ` David Laight 2023-06-01 15:37 ` [f2fs-dev] " David Laight 2023-06-01 16:13 ` Jan Kara 2023-06-01 16:13 ` [f2fs-dev] " Jan Kara 2023-06-01 16:21 ` Christian Brauner 2023-06-01 16:21 ` [f2fs-dev] " Christian Brauner 2023-06-01 16:33 ` David Laight 2023-06-01 16:33 ` [f2fs-dev] " David Laight 2023-06-02 12:34 ` Christian Brauner 2023-06-02 12:34 ` [f2fs-dev] " Christian Brauner 2023-06-01 15:59 ` Christian Brauner 2023-06-01 15:59 ` [f2fs-dev] " Christian Brauner 2023-06-02 1:36 ` kernel test robot 2023-06-02 1:36 ` kernel test robot 2023-06-01 10:58 ` [PATCH v2 5/6] fs: Lock moved directories Jan Kara 2023-06-01 10:58 ` [f2fs-dev] " Jan Kara 2023-06-01 10:58 ` [PATCH v2 6/6] fs: Restrict lock_two_nondirectories() to non-directory inodes Jan Kara 2023-06-01 10:58 ` [f2fs-dev] " Jan Kara 2023-06-02 13:05 ` [PATCH v2 0/6] fs: Fix directory corruption when moving directories Christian Brauner 2023-06-02 13:05 ` [f2fs-dev] " Christian Brauner 2023-07-06 0:18 ` patchwork-bot+f2fs 2023-07-06 0:18 ` patchwork-bot+f2fs
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230601105830.13168-1-jack@suse.cz \ --to=jack@suse.cz \ --cc=brauner@kernel.org \ --cc=djwong@kernel.org \ --cc=jaegeuk@kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=stable@vger.kernel.org \ --cc=tytso@mit.edu \ --cc=viro@ZenIV.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.