diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-11-14 06:02:22 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-11-14 06:02:22 +0300 |
| commit | 6da22013bb7907b33c87968c25034b409a6161a2 (patch) | |
| tree | f23cd3da57b7188241f7e2c9d2390fbc672ce3d4 /fs/f2fs/data.c | |
| parent | a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e (diff) | |
| parent | a6e08912861757b8b335cc49b093a51ec025c5de (diff) | |
| download | linux-6da22013bb7907b33c87968c25034b409a6161a2.tar.xz | |
Merge branch 'fscrypt' into origin
Diffstat (limited to 'fs/f2fs/data.c')
| -rw-r--r-- | fs/f2fs/data.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 9ae194fd2fdb..435590c4b341 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1194,8 +1194,11 @@ int do_write_data_page(struct f2fs_io_info *fio) f2fs_wait_on_encrypted_page_writeback(F2FS_I_SB(inode), fio->old_blkaddr); retry_encrypt: + BUG_ON(!PageLocked(fio->page)); fio->encrypted_page = fscrypt_encrypt_page(inode, fio->page, - gfp_flags); + PAGE_SIZE, 0, + fio->page->index, + gfp_flags); if (IS_ERR(fio->encrypted_page)) { err = PTR_ERR(fio->encrypted_page); if (err == -ENOMEM) { |