diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-09-14 10:15:40 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-09-19 14:27:26 +0200 |
| commit | 413eb04e1eeff0ea140b0dd5365ae04fb0dabd46 (patch) | |
| tree | ad8caea967e61829de00509c2466f54fe33bcc8d /target/linux/generic/patches-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch | |
| parent | 41a582a986595ed4e20c3e2969f31a041390e4f6 (diff) | |
| download | upstream-413eb04e1eeff0ea140b0dd5365ae04fb0dabd46.tar.gz upstream-413eb04e1eeff0ea140b0dd5365ae04fb0dabd46.tar.bz2 upstream-413eb04e1eeff0ea140b0dd5365ae04fb0dabd46.zip | |
ubifs: add full overlayfs support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/patches-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch')
| -rw-r--r-- | target/linux/generic/patches-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/patches-4.4/052-04-ubifs-Use-move-variable-in-ubifs_rename.patch b/target/linux/generic/patches-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/patches-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); |