commit 1e039533886765f50b4e58e7c337c84523ebf7b2
author Richard Weinberger <richard@nod.at> Wed Sep 14 22:28:52 2016 +0200
committer Richard Weinberger <richard@nod.at> Sun Oct 02 22:55:02 2016 +0200
tree af814877608ce90228e163c7d8fbe702fe178313
parent 9ec64962afb1702f75bdf046fffeecf9c8737518

ubifs: Use move variable in ubifs_rename()

...to make the code more consistent since we use
move already in other places.

Signed-off-by: Richard Weinberger <richard@nod.at>

fs/ubifs/journal.c

diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index 8e07f13..91bc76dc 100644
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -1100,7 +1100,7 @@
 	aligned_dlen1 = ALIGN(dlen1, 8);
 	aligned_dlen2 = ALIGN(dlen2, 8);
 	len = aligned_dlen1 + aligned_dlen2 + ALIGN(ilen, 8) + ALIGN(plen, 8);
-	if (old_dir != new_dir)
+	if (move)
 		len += plen;
 	dent = kmalloc(len, GFP_NOFS);
 	if (!dent)
@@ -1216,7 +1216,7 @@
 	if (err)
 		goto out_ro;
 
-	if (old_dir != new_dir) {
+	if (move) {
 		offs += ALIGN(plen, 8);
 		ino_key_init(c, &key, new_dir->i_ino);
 		err = ubifs_tnc_add(c, &key, lnum, offs, plen);