Skip to content

Commit 70dfe3f

Browse files
committed
libfs: Add helper to choose dentry operations at mount-time
In preparation to drop the similar helper that sets d_op at lookup time, add a version to set the right d_op filesystem-wide, through sb->s_d_op. The operations structures are shared across filesystems supporting fscrypt and/or casefolding, therefore we can keep it in common libfs code. Reviewed-by: Eric Biggers <ebiggers@google.com> Link: https://lore.kernel.org/r/20240221171412.10710-7-krisman@suse.de Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>
1 parent e6ca288 commit 70dfe3f

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

fs/libfs.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1818,6 +1818,34 @@ void generic_set_encrypted_ci_d_ops(struct dentry *dentry)
18181818
}
18191819
EXPORT_SYMBOL(generic_set_encrypted_ci_d_ops);
18201820

1821+
/**
1822+
* generic_set_sb_d_ops - helper for choosing the set of
1823+
* filesystem-wide dentry operations for the enabled features
1824+
* @sb: superblock to be configured
1825+
*
1826+
* Filesystems supporting casefolding and/or fscrypt can call this
1827+
* helper at mount-time to configure sb->s_d_op to best set of dentry
1828+
* operations required for the enabled features. The helper must be
1829+
* called after these have been configured, but before the root dentry
1830+
* is created.
1831+
*/
1832+
void generic_set_sb_d_ops(struct super_block *sb)
1833+
{
1834+
#if IS_ENABLED(CONFIG_UNICODE)
1835+
if (sb->s_encoding) {
1836+
sb->s_d_op = &generic_ci_dentry_ops;
1837+
return;
1838+
}
1839+
#endif
1840+
#ifdef CONFIG_FS_ENCRYPTION
1841+
if (sb->s_cop) {
1842+
sb->s_d_op = &generic_encrypted_dentry_ops;
1843+
return;
1844+
}
1845+
#endif
1846+
}
1847+
EXPORT_SYMBOL(generic_set_sb_d_ops);
1848+
18211849
/**
18221850
* inode_maybe_inc_iversion - increments i_version
18231851
* @inode: inode with the i_version that should be updated

include/linux/fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3281,6 +3281,7 @@ extern int generic_file_fsync(struct file *, loff_t, loff_t, int);
32813281
extern int generic_check_addressable(unsigned, u64);
32823282

32833283
extern void generic_set_encrypted_ci_d_ops(struct dentry *dentry);
3284+
extern void generic_set_sb_d_ops(struct super_block *sb);
32843285

32853286
static inline bool sb_has_encoding(const struct super_block *sb)
32863287
{

0 commit comments

Comments
 (0)