diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-17 14:30:40 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-18 15:14:39 +0100 |
| commit | 65044a50ab687274bcec79eb85ac7854f134129f (patch) | |
| tree | 444e1ff3bba95d5f152038d0b054a7fb01cfe9e0 /target/linux/generic/patches-4.4/052-02-ubifs-Implement-RENAME_WHITEOUT.patch | |
| parent | 26b80696041beb28deea2efe18e66a8a2a91e650 (diff) | |
| download | upstream-65044a50ab687274bcec79eb85ac7854f134129f.tar.gz upstream-65044a50ab687274bcec79eb85ac7854f134129f.tar.bz2 upstream-65044a50ab687274bcec79eb85ac7854f134129f.zip | |
kernel: bump 4.4 to 4.4.167
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>
Diffstat (limited to 'target/linux/generic/patches-4.4/052-02-ubifs-Implement-RENAME_WHITEOUT.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/052-02-ubifs-Implement-RENAME_WHITEOUT.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.4/052-02-ubifs-Implement-RENAME_WHITEOUT.patch b/target/linux/generic/patches-4.4/052-02-ubifs-Implement-RENAME_WHITEOUT.patch index c2ec904939..6d6ad28e96 100644 --- a/target/linux/generic/patches-4.4/052-02-ubifs-Implement-RENAME_WHITEOUT.patch +++ b/target/linux/generic/patches-4.4/052-02-ubifs-Implement-RENAME_WHITEOUT.patch @@ -244,7 +244,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at> .setxattr = ubifs_setxattr, --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c -@@ -917,14 +917,15 @@ int ubifs_jnl_delete_inode(struct ubifs_ +@@ -922,14 +922,15 @@ int ubifs_jnl_delete_inode(struct ubifs_ * @sync: non-zero if the write-buffer has to be synchronized * * This function implements the re-name operation which may involve writing up @@ -262,7 +262,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at> { void *p; union ubifs_key key; -@@ -980,13 +981,19 @@ int ubifs_jnl_rename(struct ubifs_info * +@@ -985,13 +986,19 @@ int ubifs_jnl_rename(struct ubifs_info * zero_dent_node_unused(dent); ubifs_prep_grp_node(c, dent, dlen1, 0); @@ -285,7 +285,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at> dent2->nlen = cpu_to_le16(old_dentry->d_name.len); memcpy(dent2->name, old_dentry->d_name.name, old_dentry->d_name.len); dent2->name[old_dentry->d_name.len] = '\0'; -@@ -1035,16 +1042,26 @@ int ubifs_jnl_rename(struct ubifs_info * +@@ -1040,16 +1047,26 @@ int ubifs_jnl_rename(struct ubifs_info * if (err) goto out_ro; |