diff options
| author | Richard Weinberger <richard@nod.at> | 2020-09-28 20:58:59 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2020-09-29 10:43:05 +0200 |
| commit | 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 (patch) | |
| tree | 3fb96e41c5899e06079853c01a08bafb463cba86 /fs/ubifs | |
| parent | 121b8fcbf98892d5f26d8326a00d09e4cdb76369 (diff) | |
| download | linux-78c7d49f55d8631b67c09f9bfbe8155211a9ea06.tar.gz linux-78c7d49f55d8631b67c09f9bfbe8155211a9ea06.tar.bz2 linux-78c7d49f55d8631b67c09f9bfbe8155211a9ea06.zip | |
ubifs: journal: Make sure to not dirty twice for auth nodes
When removing the last reference of an inode the size of an auth node
is already part of write_len. So we must not call ubifs_add_auth_dirt().
Call it only when needed.
Cc: <stable@vger.kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Kristof Havasi <havasiefr@gmail.com>
Fixes: 6a98bc4614de ("ubifs: Add authentication nodes to journal")
Reported-and-tested-by: Kristof Havasi <havasiefr@gmail.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index cb1fa0c37322..091c2ad8f211 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -938,8 +938,6 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode) inode->i_ino); release_head(c, BASEHD); - ubifs_add_auth_dirt(c, lnum); - if (last_reference) { err = ubifs_tnc_remove_ino(c, inode->i_ino); if (err) @@ -949,6 +947,8 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode) } else { union ubifs_key key; + ubifs_add_auth_dirt(c, lnum); + ino_key_init(c, &key, inode->i_ino); err = ubifs_tnc_add(c, &key, lnum, offs, ilen, hash); } |