diff options
| author | John Crispin <john@phrozen.org> | 2016-12-25 20:11:34 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-08-05 08:46:36 +0200 |
| commit | 74d00a8c3849c1340efd713eb94b786e304c201f (patch) | |
| tree | de481743de61c34da96ab5f9dba3af3edcfb8260 /target/linux/generic/pending-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch | |
| parent | de350550ef648d9728351b986b0516fa29465c45 (diff) | |
| download | upstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.gz upstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.bz2 upstream-74d00a8c3849c1340efd713eb94b786e304c201f.zip | |
kernel: split patches folder up into backport, pending and hack folders
* properly format/comment all patches
* merge debloat patches
* merge Kconfig patches
* merge swconfig patches
* merge hotplug patches
* drop 200-fix_localversion.patch - upstream
* drop 222-arm_zimage_none.patch - unused
* drop 252-mv_cesa_depends.patch - no longer required
* drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused
* drop 661-fq_codel_keep_dropped_stats.patch - outdated
* drop 702-phy_add_aneg_done_function.patch - upstream
* drop 840-rtc7301.patch - unused
* drop 841-rtc_pt7c4338.patch - upstream
* drop 921-use_preinit_as_init.patch - unused
* drop spio-gpio-old and gpio-mmc - unused
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/generic/pending-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch')
| -rw-r--r-- | target/linux/generic/pending-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/pending-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch b/target/linux/generic/pending-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch new file mode 100644 index 0000000000..81129359d3 --- /dev/null +++ b/target/linux/generic/pending-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch @@ -0,0 +1,30 @@ +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); |