diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-12-12 21:50:28 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-12-12 21:50:28 -0500 |
| commit | a551d7c8deefb6d9fb45a1de03a617dd064e0419 (patch) | |
| tree | c58f83ef3edd83d55f8f574cfe7ba023e029090b /fs/ext4/inode.c | |
| parent | 0cb80b4847553582830a59da2c022c37a1f4a119 (diff) | |
| parent | 6a34e4d2be07255cc59e6ccaf820669cfd7f815c (diff) | |
Merge branch 'fscrypt' into dev
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 f9f892212308..72d593fa690d 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3851,7 +3851,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)); } |