- rel 2; add cgroup writeback suport for xfs (not merged by upstream only due to...

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 319191ce2821f2eacb3c4fdd4b50d92f33d2f795..1fbd7c139408c56eeeec5bf7b1f8c086a8440c98 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -61,3 +61,45 @@ index 098ce9b179ee..fcf8d0aa66ec 100644
 -- 
 2.11.0
 
+From: Shaohua Li <shli@fb.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.
+
+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;
+ 
+       /* version 5 superblocks support inode version counters. */
+       if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)

diff --git a/kernel.spec b/kernel.spec
index 26905fd734ddbe56fc65f0433aca1a99367ce3b9..3396d23116cfdd76ada56de65916333afe0872fb 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
+%define                rel             2
 %define                basever         4.9
 %define                postver         .137