- 4.9.207

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 48bb4ab577ae414e747a6dcd9f463c76bdcbbf24..12130347edfedd51684642703b98acab57e2463f 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -27,57 +27,45 @@
                        fi
                done
 
-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
-@@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const
-       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);
-+      }
-+
-       SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
-       dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
- 
-commit 8efb88340e29293e05f6b498b60596884c05a8a8
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Mon Jul 8 13:44:45 2013 -0400
+From: Shaohua Li <shli@fb.com>
 
-    svcrpc: fix failures to handle -1 uid's
-    
-    As of f025adf191924e3a75ce80e130afcd2485b53bb8 "sunrpc: Properly decode
-    kuids and kgids in RPC_AUTH_UNIX credentials" any rpc containing a -1
-    (0xffff) uid or gid would fail with a badcred error.
-    
-    Commit afe3c3fd5392b2f0066930abc5dbd3f4b14a0f13 "svcrpc: fix failures to
-    handle -1 uid's and gid's" fixed part of the problem, but overlooked the
-    gid upcall--the kernel can request supplementary gid's for the -1 uid,
-    but mountd's attempt write a response will get -EINVAL.
-    
-    Symptoms were nfsd failing to reply to the first attempt to use a newly
-    negotiated krb5 context.
-    
-    Reported-by: Sven Geggus <lists@fuchsschwanzdomain.de>
-    Tested-by: Sven Geggus <lists@fuchsschwanzdomain.de>
-    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+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/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
-index a98853d..621ca7b 100644
---- a/net/sunrpc/svcauth_unix.c
-+++ b/net/sunrpc/svcauth_unix.c
-@@ -493,8 +493,6 @@ static int unix_gid_parse(struct cache_detail *cd,
-       if (rv)
-               return -EINVAL;
-       uid = make_kuid(&init_user_ns, id);
--      if (!uid_valid(uid))
--              return -EINVAL;
-       ug.uid = uid;
+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(+)
+
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
+index f18e593..6535054 100644
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -630,8 +630,10 @@ xfs_add_to_ioend(
+               if (wpc->ioend)
+                       list_add(&wpc->ioend->io_list, iolist);
+               wpc->ioend = xfs_alloc_ioend(inode, wpc->io_type, offset, bh);
++              wbc_init_bio(wbc, wpc->ioend->io_bio);
+       }
+ 
++      wbc_account_io(wbc, bh->b_page, bh->b_size);
+       /*
+        * If the buffer doesn't fit into the bio we need to allocate a new
+        * one.  This shouldn't happen more than once for a given buffer.
+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;
  
-       expiry = get_expiry(&mesg);
+       /* version 5 superblocks support inode version counters. */
+       if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)