aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2017-04-26 11:11:12 -0700
committerMoyster <oysterized@gmail.com>2017-05-21 18:43:19 +0200
commitbb0a81afc17c347ce89373af79025cd34419fa0f (patch)
treea1d81d5fcb3dcc74e50498968fb308c59f58d58c
parent71a49311c55e38ba61eeb5ab96d147a35c6cba27 (diff)
f2fs: nullify fio->encrypted_page for each writes
This makes sure each write request has nullified encrypted_page pointer. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Conflicts: fs/f2fs/segment.c
-rw-r--r--fs/f2fs/segment.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 603a4afb8..993ef95f8 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -349,8 +349,7 @@ static int __commit_inmem_pages(struct inode *inode,
.sbi = sbi,
.type = DATA,
.op = REQ_OP_WRITE,
- .op_flags = REQ_SYNC | REQ_NOIDLE | REQ_PRIO,
- .encrypted_page = NULL,
+ .op_flags = REQ_SYNC | REQ_PRIO,
};
pgoff_t last_idx = ULONG_MAX;
int err = 0;
@@ -371,6 +370,7 @@ static int __commit_inmem_pages(struct inode *inode,
fio.page = page;
fio.old_blkaddr = NULL_ADDR;
+ fio.encrypted_page = NULL;
err = do_write_data_page(&fio);
if (err) {
unlock_page(page);