diff options
author | Richard Weinberger <richard@nod.at> | 2017-06-26 13:49:04 +0200 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2017-07-14 22:50:57 +0200 |
commit | a6664433d383eeb71cbdeb9aea2c66eeea76e742 (patch) | |
tree | a1536db561b390b5c548dab31264633ae24b1483 /fs | |
parent | ubifs: Massage assert in ubifs_xattr_set() wrt. init_xattrs (diff) | |
download | linux-a6664433d383eeb71cbdeb9aea2c66eeea76e742.tar.xz linux-a6664433d383eeb71cbdeb9aea2c66eeea76e742.zip |
ubifs: Set double hash cookie also for RENAME_EXCHANGE
We developed RENAME_EXCHANGE and UBIFS_FLG_DOUBLE_HASH more or less in
parallel and this case was forgotten. :-(
Cc: stable@vger.kernel.org
Fixes: d63d61c16972 ("ubifs: Implement UBIFS_FLG_DOUBLE_HASH")
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ubifs/journal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 9f356432f35f..04c4ec6483e5 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -985,6 +985,7 @@ int ubifs_jnl_xrename(struct ubifs_info *c, const struct inode *fst_dir, dent1->nlen = cpu_to_le16(fname_len(snd_nm)); memcpy(dent1->name, fname_name(snd_nm), fname_len(snd_nm)); dent1->name[fname_len(snd_nm)] = '\0'; + set_dent_cookie(c, dent1); zero_dent_node_unused(dent1); ubifs_prep_grp_node(c, dent1, dlen1, 0); @@ -997,6 +998,7 @@ int ubifs_jnl_xrename(struct ubifs_info *c, const struct inode *fst_dir, dent2->nlen = cpu_to_le16(fname_len(fst_nm)); memcpy(dent2->name, fname_name(fst_nm), fname_len(fst_nm)); dent2->name[fname_len(fst_nm)] = '\0'; + set_dent_cookie(c, dent2); zero_dent_node_unused(dent2); ubifs_prep_grp_node(c, dent2, dlen2, 0); |