index : openwrt/upstream	attitude_adjustment barrier_breaker chaos_calmer lede-17.01 less-old-master master old-master openwrt-18.06 openwrt-19.07 upstream
	upstream openwrt	James

aboutsummaryrefslogtreecommitdiffstats

log msg author committer range

path: root/package/bridge/patches

	Commit message (Expand)	Author	Age	Files	Lines
*	refresh all package patches in the buildroot using quilt	Felix Fietkau	2007-06-04	1	-2/+4
*	trunk.. same deal as changeset:6526	Tim Yardley	2007-03-05	1	-0/+0
*	Rename patches to match conventions	Florian Fainelli	2007-01-11	1	-0/+0
*	sync with buildroot2 from uclibc, separate ptches in subdir	Waldemar Brodkorb	2005-02-19	1	-0/+11

generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 15:47:41 +0000

From: Richard Weinberger <richard@nod.at>
Date: Tue, 13 Sep 2016 16:18:58 +0200
Subject: [PATCH] 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>
---

--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -1100,7 +1100,7 @@ int ubifs_jnl_rename(struct ubifs_info *
 	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 @@ int ubifs_jnl_rename(struct ubifs_info *
 	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);