mirror of
https://github.com/openwrt/openwrt.git
synced 2025-03-12 15:34:59 +00:00
65044a50ab
Refreshed all patches. Removed upstreamed: - 203-MIPS-ath79-fix-restart.patch - 330-Revert-MIPS-BCM47XX-Enable-74K-Core-ExternalSync-for.patch - 051-0001-ovl-rename-is_merge-to-is_lowest.patch - 051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch - 051-0005-ovl-proper-cleanup-of-workdir.patch Altered patches: - 201-extra_optimization.patch - 304-mips_disable_fpu.patch Compile-tested on: ar71xx, cns3xxx, imx6, mpc85xx Runtime-tested on: ar71xx, cns3xxx, imx6, mpc85xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
31 lines
887 B
Diff
31 lines
887 B
Diff
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
|
|
@@ -1105,7 +1105,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)
|
|
@@ -1221,7 +1221,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);
|