6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guoyu Ou benogy@gmail.com
commit 6bb3f7f4c3f4da8e09de188f2f63e8f741bba3bd upstream.
Parent dir is locked by user_path_locked_at() before validating the required dentry. It should be unlocked if we can not perform the deletion.
This fixes the problem:
$ bcachefs subvolume delete not-exist-entry BCH_IOCTL_SUBVOLUME_DESTROY ioctl error: No such file or directory $ bcachefs subvolume delete not-exist-entry
the second will stuck because the parent dir is locked in the previous deletion.
Signed-off-by: Guoyu Ou benogy@gmail.com Signed-off-by: Kent Overstreet kent.overstreet@linux.dev Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- fs/bcachefs/fs-ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/bcachefs/fs-ioctl.c +++ b/fs/bcachefs/fs-ioctl.c @@ -463,6 +463,7 @@ static long bch2_ioctl_subvolume_destroy if (IS_ERR(victim)) return PTR_ERR(victim);
+ dir = d_inode(path.dentry); if (victim->d_sb->s_fs_info != c) { ret = -EXDEV; goto err; @@ -471,14 +472,13 @@ static long bch2_ioctl_subvolume_destroy ret = -ENOENT; goto err; } - dir = d_inode(path.dentry); ret = __bch2_unlink(dir, victim, true); if (!ret) { fsnotify_rmdir(dir, victim); d_delete(victim); } - inode_unlock(dir); err: + inode_unlock(dir); dput(victim); path_put(&path); return ret;