X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel-small_fixes.patch;h=b97c7aafdb86c3ebfb2d414fc39ae3dc41fbbff6;hb=679d237fdefebb21903f94f8dfb1dc357f852489;hp=9b809da2c299549c8830af6df1b202593eafc761;hpb=aca2852915e8cb81080bdf64933e4baadbc2a74f;p=packages%2Fkernel.git

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 9b809da2..b97c7aaf 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -1,79 +1,40 @@
---- linux-2.6.33/scripts/mod/modpost.c~	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.33/scripts/mod/modpost.c	2010-03-07 14:26:47.242168558 +0100
-@@ -15,7 +15,8 @@
- #include <stdio.h>
- #include <ctype.h>
- #include "modpost.h"
--#include "../../include/generated/autoconf.h"
-+// PLD architectures don't use CONFIG_SYMBOL_PREFIX
-+//#include "../../include/generated/autoconf.h"
- #include "../../include/linux/license.h"
- 
- /* Some toolchains use a `_' prefix for all user symbols. */
+From: Shaohua Li <shli@fb.com>
 
---- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~	2011-07-22 04:17:23.000000000 +0200
-+++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh	2011-08-25 21:26:04.799150642 +0200
-@@ -9,6 +9,12 @@
- 			$cc -print-file-name=lib${lib}.${ext} | grep -q /
- 			if [ $? -eq 0 ]; then
- 				echo "-l${lib}"
-+				for libt in tinfow tinfo ; do
-+					$cc -print-file-name=lib${libt}.${ext} | grep -q /
-+					if [ $? -eq 0 ]; then
-+						echo "-l${libt}"
-+					fi
-+				done
- 				exit
- 			fi
- 		done
+Basically this is a copy of commit 001e4a8775f6(ext4: implement cgroup
+writeback support). Tested with a fio test, verified writeback is
+throttled against cgroup io.max write bandwidth, also verified moving
+the fio test to another cgroup and the writeback is throttled against
+new cgroup setting.
 
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -4103,6 +4103,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
- 	/* Get MAC address */
- 	for (i = 0; i < ETH_ALEN; i++)
- 		dev->dev_addr[i] = RTL_R8(MAC0 + i);
-+
-+	if (!is_valid_ether_addr(dev->dev_addr)) {
-+		/* Report it and use a random ethernet address instead */
-+		netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+		random_ether_addr(dev->dev_addr);
-+		netdev_info(dev, "Using random MAC address: %pM\n",
-+			    dev->dev_addr);
-+	}
- 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- 
- 	SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
--- 
-1.7.7.3
+Cc: Tejun Heo <tj@kernel.org>
+Signed-off-by: Shaohua Li <shli@fb.com>
+---
+ fs/xfs/xfs_aops.c  | 2 ++
+ fs/xfs/xfs_super.c | 1 +
+ 2 files changed, 3 insertions(+)
 
-  
---- linux-3.4/fs/unionfs/commonfops.c.org	2012-05-29 20:40:20.756489877 +0200
-+++ linux-3.4/fs/unionfs/commonfops.c	2012-05-29 21:07:12.021252743 +0200
-@@ -766,7 +766,7 @@
- 				   unsigned int cmd, unsigned long arg)
- {
- 	int err = 0;
--	fd_set branchlist;
-+	unsigned long branchlist = 0;
- 	int bstart = 0, bend = 0, bindex = 0;
- 	int orig_bstart, orig_bend;
- 	struct dentry *dentry, *lower_dentry;
-@@ -781,14 +781,12 @@
- 	bstart = dbstart(dentry);
- 	bend = dbend(dentry);
+--- linux-4.19/fs/xfs/xfs_aops.c.org	2018-11-21 10:31:12.348955352 +0100
++++ linux-4.19/fs/xfs/xfs_aops.c	2018-11-21 10:34:35.241764742 +0100
+@@ -613,8 +613,10 @@ xfs_add_to_ioend(
+ 			list_add(&wpc->ioend->io_list, iolist);
+ 		wpc->ioend = xfs_alloc_ioend(inode, wpc->io_type, offset,
+ 				bdev, sector);
++		wbc_init_bio(wbc, wpc->ioend->io_bio);
+ 	}
+ 
++	wbc_account_io(wbc, page, len);
+ 	if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff)) {
+ 		if (iop)
+ 			atomic_inc(&iop->write_count);
+diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
+index 584cf2d..aea3bc2 100644
+--- a/fs/xfs/xfs_super.c
++++ b/fs/xfs/xfs_super.c
+@@ -1634,6 +1634,7 @@ xfs_fs_fill_super(
+ 	sb->s_max_links = XFS_MAXLINK;
+ 	sb->s_time_gran = 1;
+ 	set_posix_acl_flag(sb);
++	sb->s_iflags |= SB_I_CGROUPWB;
  
--	FD_ZERO(&branchlist);
--
- 	for (bindex = bstart; bindex <= bend; bindex++) {
- 		lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
- 		if (!lower_dentry)
- 			continue;
- 		if (likely(lower_dentry->d_inode))
--			FD_SET(bindex, &branchlist);
-+			__set_bit(bindex, &branchlist);
- 		/* purge any lower objects after partial_lookup */
- 		if (bindex < orig_bstart || bindex > orig_bend) {
- 			dput(lower_dentry);
+ 	/* version 5 superblocks support inode version counters. */
+ 	if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)