[folded-merged] writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix-2.patch removed from -mm tree

[folded-merged] writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix-2.patch removed from -mm tree

[akpm]

The patch titled
     Subject: writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix-2
has been removed from the -mm tree.  Its filename was
     writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix-2.patch

This patch was dropped because it was folded into writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes.patch

------------------------------------------------------
From: Roman Gushchin <guro@fb.com>
Subject: writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix-2

replace open-coded "115" with arithmetic

Link: https://lkml.kernel.org/r/YMEcSBcq/VXMiPPO@carbon.dhcp.thefacebook.com

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/fs-writeback.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/fs/fs-writeback.c~writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix-2
+++ a/fs/fs-writeback.c
@@ -229,7 +229,8 @@ void wb_wait_for_completion(struct wb_co
  * Maximum inodes per isw.  A specific value has been chosen to make
  * struct inode_switch_wbs_context fit into 1024 bytes kmalloc.
  */
-#define WB_MAX_INODES_PER_ISW	115
+#define WB_MAX_INODES_PER_ISW  ((1024UL - sizeof(struct inode_switch_wbs_context)) \
+                                / sizeof(struct inode *))
 
 static atomic_t isw_nr_in_flight = ATOMIC_INIT(0);
 static struct workqueue_struct *isw_wq;
_

Patches currently in -mm which might be from guro@fb.com are

writeback-cgroup-do-not-switch-inodes-with-i_will_free-flag.patch
writeback-cgroup-add-smp_mb-to-cgroup_writeback_umount.patch
writeback-cgroup-increment-isw_nr_in_flight-before-grabbing-an-inode.patch
writeback-cgroup-switch-to-rcu_work-api-in-inode_switch_wbs.patch
writeback-cgroup-keep-list-of-inodes-attached-to-bdi_writeback.patch
writeback-cgroup-split-out-the-functional-part-of-inode_switch_wbs_work_fn.patch
writeback-cgroup-support-switching-multiple-inodes-at-once.patch
writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes.patch
writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix.patch