diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-26 08:52:31 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2019-05-07 21:58:31 +0200 |
| commit | eea2c05d927b031034e222110a4fc34914d97ca4 (patch) | |
| tree | a5fc633c4d6795d332e247aa7bdc280c32df7388 /fs/ubifs/super.c | |
| parent | 9ca2d732644484488db31123ecd3bf122b551566 (diff) | |
| download | linux-stable-eea2c05d927b031034e222110a4fc34914d97ca4.tar.gz linux-stable-eea2c05d927b031034e222110a4fc34914d97ca4.tar.bz2 linux-stable-eea2c05d927b031034e222110a4fc34914d97ca4.zip | |
ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION
ifdefs reduce readablity and compile coverage. This removes the ifdefs
around CONFIG_FS_ENCRYPTION by using IS_ENABLED and relying on static
inline wrappers. A new static inline wrapper for setting sb->s_cop is
introduced to allow filesystems to unconditionally compile in their
s_cop operations.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs/super.c')
| -rw-r--r-- | fs/ubifs/super.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 300458a4f518..d0c1228635f0 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2146,9 +2146,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) #ifdef CONFIG_UBIFS_FS_XATTR sb->s_xattr = ubifs_xattr_handlers; #endif -#ifdef CONFIG_FS_ENCRYPTION - sb->s_cop = &ubifs_crypt_operations; -#endif + fscrypt_set_ops(sb, &ubifs_crypt_operations); mutex_lock(&c->umount_mutex); err = mount_ubifs(c); |