diff options
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 71bd2d28f58d..4356ef6d728e 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -1150,7 +1150,7 @@ int do_journal_get_write_access(handle_t *handle, | |||
1150 | return ret; | 1150 | return ret; |
1151 | } | 1151 | } |
1152 | 1152 | ||
1153 | #ifdef CONFIG_EXT4_FS_ENCRYPTION | 1153 | #ifdef CONFIG_FS_ENCRYPTION |
1154 | static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, | 1154 | static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, |
1155 | get_block_t *get_block) | 1155 | get_block_t *get_block) |
1156 | { | 1156 | { |
@@ -1302,7 +1302,7 @@ retry_journal: | |||
1302 | /* In case writeback began while the page was unlocked */ | 1302 | /* In case writeback began while the page was unlocked */ |
1303 | wait_for_stable_page(page); | 1303 | wait_for_stable_page(page); |
1304 | 1304 | ||
1305 | #ifdef CONFIG_EXT4_FS_ENCRYPTION | 1305 | #ifdef CONFIG_FS_ENCRYPTION |
1306 | if (ext4_should_dioread_nolock(inode)) | 1306 | if (ext4_should_dioread_nolock(inode)) |
1307 | ret = ext4_block_write_begin(page, pos, len, | 1307 | ret = ext4_block_write_begin(page, pos, len, |
1308 | ext4_get_block_unwritten); | 1308 | ext4_get_block_unwritten); |
@@ -3104,7 +3104,7 @@ retry_journal: | |||
3104 | /* In case writeback began while the page was unlocked */ | 3104 | /* In case writeback began while the page was unlocked */ |
3105 | wait_for_stable_page(page); | 3105 | wait_for_stable_page(page); |
3106 | 3106 | ||
3107 | #ifdef CONFIG_EXT4_FS_ENCRYPTION | 3107 | #ifdef CONFIG_FS_ENCRYPTION |
3108 | ret = ext4_block_write_begin(page, pos, len, | 3108 | ret = ext4_block_write_begin(page, pos, len, |
3109 | ext4_da_get_block_prep); | 3109 | ext4_da_get_block_prep); |
3110 | #else | 3110 | #else |
@@ -3879,7 +3879,7 @@ static ssize_t ext4_direct_IO(struct kiocb *iocb, struct iov_iter *iter) | |||
3879 | loff_t offset = iocb->ki_pos; | 3879 | loff_t offset = iocb->ki_pos; |
3880 | ssize_t ret; | 3880 | ssize_t ret; |
3881 | 3881 | ||
3882 | #ifdef CONFIG_EXT4_FS_ENCRYPTION | 3882 | #ifdef CONFIG_FS_ENCRYPTION |
3883 | if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)) | 3883 | if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)) |
3884 | return 0; | 3884 | return 0; |
3885 | #endif | 3885 | #endif |