diff options
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index fb12d3c17c1b..60da0a6e4d86 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -1232,7 +1232,7 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page, | |||
| 1232 | return try_to_free_buffers(page); | 1232 | return try_to_free_buffers(page); |
| 1233 | } | 1233 | } |
| 1234 | 1234 | ||
| 1235 | #ifdef CONFIG_EXT4_FS_ENCRYPTION | 1235 | #ifdef CONFIG_FS_ENCRYPTION |
| 1236 | static int ext4_get_context(struct inode *inode, void *ctx, size_t len) | 1236 | static int ext4_get_context(struct inode *inode, void *ctx, size_t len) |
| 1237 | { | 1237 | { |
| 1238 | return ext4_xattr_get(inode, EXT4_XATTR_INDEX_ENCRYPTION, | 1238 | return ext4_xattr_get(inode, EXT4_XATTR_INDEX_ENCRYPTION, |
| @@ -1922,7 +1922,7 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, | |||
| 1922 | *journal_ioprio = | 1922 | *journal_ioprio = |
| 1923 | IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg); | 1923 | IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg); |
| 1924 | } else if (token == Opt_test_dummy_encryption) { | 1924 | } else if (token == Opt_test_dummy_encryption) { |
| 1925 | #ifdef CONFIG_EXT4_FS_ENCRYPTION | 1925 | #ifdef CONFIG_FS_ENCRYPTION |
| 1926 | sbi->s_mount_flags |= EXT4_MF_TEST_DUMMY_ENCRYPTION; | 1926 | sbi->s_mount_flags |= EXT4_MF_TEST_DUMMY_ENCRYPTION; |
| 1927 | ext4_msg(sb, KERN_WARNING, | 1927 | ext4_msg(sb, KERN_WARNING, |
| 1928 | "Test dummy encryption mode enabled"); | 1928 | "Test dummy encryption mode enabled"); |
| @@ -4167,7 +4167,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
| 4167 | sb->s_op = &ext4_sops; | 4167 | sb->s_op = &ext4_sops; |
| 4168 | sb->s_export_op = &ext4_export_ops; | 4168 | sb->s_export_op = &ext4_export_ops; |
| 4169 | sb->s_xattr = ext4_xattr_handlers; | 4169 | sb->s_xattr = ext4_xattr_handlers; |
| 4170 | #ifdef CONFIG_EXT4_FS_ENCRYPTION | 4170 | #ifdef CONFIG_FS_ENCRYPTION |
| 4171 | sb->s_cop = &ext4_cryptops; | 4171 | sb->s_cop = &ext4_cryptops; |
| 4172 | #endif | 4172 | #endif |
| 4173 | #ifdef CONFIG_QUOTA | 4173 | #ifdef CONFIG_QUOTA |
