From: Tejun Heo <tj@kernel.org>
Date: Thu, 24 Sep 2015 20:59:19 +0000 (-0400)
Subject: cgroup: Merge branch 'for-4.3-fixes' into for-4.4
X-Git-Tag: android-x86-6.0-r1~423^2~19
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c0522908d22e0b8669e01a7706720996c773e7f4;p=android-x86%2Fkernel.git

cgroup: Merge branch 'for-4.3-fixes' into for-4.4

Pull to receive 9badce000e2c ("cgroup, writeback: don't enable cgroup
writeback on traditional hierarchies").  The commit adds
cgroup_on_dfl() usages in include/linux/backing-dev.h thus causing a
silent conflict with 9e10a130d9b6 ("cgroup: replace cgroup_on_dfl()
tests in controllers with cgroup_subsys_on_dfl()").  The conflict is
fixed during this merge.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

c0522908d22e0b8669e01a7706720996c773e7f4
diff --cc include/linux/backing-dev.h
index 5a5d79ee256f,d5eb4ad1c534..08d9a8eac42c
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@@ -258,7 -263,9 +262,9 @@@ static inline bool inode_cgwb_enabled(s
  {
  	struct backing_dev_info *bdi = inode_to_bdi(inode);
  
- 	return bdi_cap_account_dirty(bdi) &&
 -	return cgroup_on_dfl(mem_cgroup_root_css->cgroup) &&
 -		cgroup_on_dfl(blkcg_root_css->cgroup) &&
++	return cgroup_subsys_on_dfl(memory_cgrp_subsys) &&
++		cgroup_subsys_on_dfl(io_cgrp_subsys) &&
+ 		bdi_cap_account_dirty(bdi) &&
  		(bdi->capabilities & BDI_CAP_CGROUP_WRITEBACK) &&
  		(inode->i_sb->s_iflags & SB_I_CGROUPWB);
  }