diff options
author | Richard Weinberger <richard@nod.at> | 2017-06-26 07:49:04 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2017-07-14 16:50:57 -0400 |
commit | a6664433d383eeb71cbdeb9aea2c66eeea76e742 (patch) | |
tree | a1536db561b390b5c548dab31264633ae24b1483 | |
parent | d8db5b1ca9d4c57e49893d0f78e6d5ce81450cc8 (diff) |
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>
-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, | |||
985 | dent1->nlen = cpu_to_le16(fname_len(snd_nm)); | 985 | dent1->nlen = cpu_to_le16(fname_len(snd_nm)); |
986 | memcpy(dent1->name, fname_name(snd_nm), fname_len(snd_nm)); | 986 | memcpy(dent1->name, fname_name(snd_nm), fname_len(snd_nm)); |
987 | dent1->name[fname_len(snd_nm)] = '\0'; | 987 | dent1->name[fname_len(snd_nm)] = '\0'; |
988 | set_dent_cookie(c, dent1); | ||
988 | zero_dent_node_unused(dent1); | 989 | zero_dent_node_unused(dent1); |
989 | ubifs_prep_grp_node(c, dent1, dlen1, 0); | 990 | ubifs_prep_grp_node(c, dent1, dlen1, 0); |
990 | 991 | ||
@@ -997,6 +998,7 @@ int ubifs_jnl_xrename(struct ubifs_info *c, const struct inode *fst_dir, | |||
997 | dent2->nlen = cpu_to_le16(fname_len(fst_nm)); | 998 | dent2->nlen = cpu_to_le16(fname_len(fst_nm)); |
998 | memcpy(dent2->name, fname_name(fst_nm), fname_len(fst_nm)); | 999 | memcpy(dent2->name, fname_name(fst_nm), fname_len(fst_nm)); |
999 | dent2->name[fname_len(fst_nm)] = '\0'; | 1000 | dent2->name[fname_len(fst_nm)] = '\0'; |
1001 | set_dent_cookie(c, dent2); | ||
1000 | zero_dent_node_unused(dent2); | 1002 | zero_dent_node_unused(dent2); |
1001 | ubifs_prep_grp_node(c, dent2, dlen2, 0); | 1003 | ubifs_prep_grp_node(c, dent2, dlen2, 0); |
1002 | 1004 | ||