summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/segment.c
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2015-05-12 13:40:20 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2015-06-01 16:20:57 -0700
commitca40b0305209248e5fd05f6ba8a3874656ff0117 (patch)
tree65e86f731b5da91f6572f3fda670359661165951 /fs/f2fs/segment.c
parent640778fbc97b36757bd1f857ba4b599a200517c2 (diff)
downloadop-kernel-dev-ca40b0305209248e5fd05f6ba8a3874656ff0117.zip
op-kernel-dev-ca40b0305209248e5fd05f6ba8a3874656ff0117.tar.gz
f2fs crypto: shrink size of the f2fs_crypto_ctx structure
This patch integrates the below patch into f2fs. "ext4 crypto: shrink size of the ext4_crypto_ctx structure Some fields are only used when the crypto_ctx is being used on the read path, some are only used on the write path, and some are only used when the structure is on free list. Optimize memory use by using a union." Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/segment.c')
-rw-r--r--fs/f2fs/segment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 190e055..e0821d2 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1382,7 +1382,7 @@ static inline bool is_merged_page(struct f2fs_sb_info *sbi,
/* encrypted page */
ctx = (struct f2fs_crypto_ctx *)page_private(
bvec->bv_page);
- target = ctx->control_page;
+ target = ctx->w.control_page;
}
if (page == target) {
OpenPOWER on IntegriCloud