Skip to content

Commit 78c8500

Browse files
committed
Merge patch series "Fix two regressions from start_creating()/start_removing() conversion"
Tyler Hicks <code@tyhicks.com> says: When running the eCryptfs test suite on v6.19-rc2, I noticed BUG splats from every test and that the umount utility was segfaulting when tearing down after a test. Bisection led me to commit f046fbb ("ecryptfs: use new start_creating/start_removing APIs"). This patch series addresses that regression and also a mknod problem spotted during code review. * patches from https://patch.msgid.link/20251223194153.2818445-1-code@tyhicks.com: ecryptfs: Release lower parent dentry after creating dir ecryptfs: Fix improper mknod pairing of start_creating()/end_removing() Link: https://patch.msgid.link/20251223194153.2818445-1-code@tyhicks.com Signed-off-by: Christian Brauner <brauner@kernel.org>
2 parents 3dd57dd + 5c56afd commit 78c8500

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/ecryptfs/inode.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ static struct dentry *ecryptfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
533533
fsstack_copy_inode_size(dir, lower_dir);
534534
set_nlink(dir, lower_dir->i_nlink);
535535
out:
536+
dput(lower_dir_dentry);
536537
end_creating(lower_dentry);
537538
if (d_really_is_negative(dentry))
538539
d_drop(dentry);
@@ -584,7 +585,7 @@ ecryptfs_mknod(struct mnt_idmap *idmap, struct inode *dir,
584585
fsstack_copy_attr_times(dir, lower_dir);
585586
fsstack_copy_inode_size(dir, lower_dir);
586587
out:
587-
end_removing(lower_dentry);
588+
end_creating(lower_dentry);
588589
if (d_really_is_negative(dentry))
589590
d_drop(dentry);
590591
return rc;

0 commit comments

Comments
 (0)