diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-10-09 21:15:38 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-10-19 01:52:37 +0200 |
| commit | ffcc41829ae043d0830bcd4536812fec7e098d93 (patch) | |
| tree | dec5c48fa7632fe85d8b639644723d242b07e71a /fs/ubifs | |
| parent | fscrypt: remove ->is_encrypted() (diff) | |
| download | linux-ffcc41829ae043d0830bcd4536812fec7e098d93.tar.xz linux-ffcc41829ae043d0830bcd4536812fec7e098d93.zip | |
fscrypt: remove unneeded empty fscrypt_operations structs
In the case where a filesystem has been configured without encryption
support, there is no longer any need to initialize ->s_cop at all, since
none of the methods are ever called.
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/super.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index adaca6088836..7503e7cdf870 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2007,11 +2007,6 @@ static struct ubifs_info *alloc_ubifs_info(struct ubi_volume_desc *ubi) return c; } -#ifndef CONFIG_UBIFS_FS_ENCRYPTION -const struct fscrypt_operations ubifs_crypt_operations = { -}; -#endif - static int ubifs_fill_super(struct super_block *sb, void *data, int silent) { struct ubifs_info *c = sb->s_fs_info; @@ -2054,7 +2049,9 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) sb->s_maxbytes = c->max_inode_sz = MAX_LFS_FILESIZE; sb->s_op = &ubifs_super_operations; sb->s_xattr = ubifs_xattr_handlers; +#ifdef CONFIG_UBIFS_FS_ENCRYPTION sb->s_cop = &ubifs_crypt_operations; +#endif mutex_lock(&c->umount_mutex); err = mount_ubifs(c); |