4.12-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Richard Weinberger <[email protected]>

commit a6664433d383eeb71cbdeb9aea2c66eeea76e742 upstream.

We developed RENAME_EXCHANGE and UBIFS_FLG_DOUBLE_HASH more or less in
parallel and this case was forgotten. :-(

Fixes: d63d61c16972 ("ubifs: Implement UBIFS_FLG_DOUBLE_HASH")
Signed-off-by: Richard Weinberger <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 fs/ubifs/journal.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -984,6 +984,7 @@ int ubifs_jnl_xrename(struct ubifs_info
        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);
 
@@ -996,6 +997,7 @@ int ubifs_jnl_xrename(struct ubifs_info
        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);
 


Reply via email to