From f1f52d6b029776bef4a60cc30011a81f0420a873 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 29 Sep 2016 21:17:15 +0200 Subject: ubifs: Introduce new data node field, compr_size When data of a data node is compressed and encrypted we need to store the size of the compressed data because before encryption we may have to add padding bytes. For the new field we consume the last two padding bytes in struct ubifs_data_node. Two bytes are fine because the data length is at most 4096. Signed-off-by: Richard Weinberger --- fs/ubifs/journal.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'fs/ubifs/journal.c') diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 91bc76dc559e..b5e86c4da48f 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -81,15 +81,6 @@ static inline void zero_dent_node_unused(struct ubifs_dent_node *dent) memset(dent->padding2, 0, 4); } -/** - * zero_data_node_unused - zero out unused fields of an on-flash data node. - * @data: the data node to zero out - */ -static inline void zero_data_node_unused(struct ubifs_data_node *data) -{ - memset(data->padding, 0, 2); -} - /** * zero_trun_node_unused - zero out unused fields of an on-flash truncation * node. @@ -722,7 +713,6 @@ int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode, data->ch.node_type = UBIFS_DATA_NODE; key_write(c, key, &data->key); data->size = cpu_to_le32(len); - zero_data_node_unused(data); if (!(ui->flags & UBIFS_COMPR_FL)) /* Compression is disabled for this inode */ @@ -1357,7 +1347,6 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode, dn->size = cpu_to_le32(dlen); dlen += UBIFS_DATA_NODE_SZ; } - zero_data_node_unused(dn); } } } -- cgit v1.2.3-59-g8ed1b