diff options
author | David Gstir <david@sigma-star.at> | 2016-12-06 23:53:56 +0100 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2016-12-11 16:26:12 -0500 |
commit | bd7b8290388dd58a8c0a3710b171e58ef952ca4d (patch) | |
tree | dc2d2057b88637522ed061d0872204af055e9b2d /fs/ext4/inode.c | |
parent | 1400451f04f2ff28b658b92557495e5090914aee (diff) | |
download | op-kernel-dev-bd7b8290388dd58a8c0a3710b171e58ef952ca4d.zip op-kernel-dev-bd7b8290388dd58a8c0a3710b171e58ef952ca4d.tar.gz |
fscrypt: Cleanup page locking requirements for fscrypt_{decrypt,encrypt}_page()
Rename the FS_CFLG_INPLACE_ENCRYPTION flag to FS_CFLG_OWN_PAGES which,
when set, indicates that the fs uses pages under its own control as
opposed to writeback pages which require locking and a bounce buffer for
encryption.
Signed-off-by: David Gstir <david@sigma-star.at>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 1485ac2..fb2b514 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3744,7 +3744,6 @@ static int __ext4_block_zero_page_range(handle_t *handle, /* We expect the key to be set. */ BUG_ON(!fscrypt_has_encryption_key(inode)); BUG_ON(blocksize != PAGE_SIZE); - BUG_ON(!PageLocked(page)); WARN_ON_ONCE(fscrypt_decrypt_page(page->mapping->host, page, PAGE_SIZE, 0, page->index)); } |