[Devel] [PATCH RHEL7 COMMIT] Revert "ms/sysfs: do not account sysfs_ino_ida allocations to memcg"

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-327.10.1.vz7.12.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.10.1.vz7.12.16
------>
commit 5b5ccc7155baf38ae61fd70dab5fb7a2fc61eb8e
Author: Vladimir Davydov <vdavydov at virtuozzo.com>
Date:   Mon May 2 18:05:59 2016 +0400

    Revert "ms/sysfs: do not account sysfs_ino_ida allocations to memcg"
    
    This reverts commit 4771e50a884a2257d793354f53b889e3643a7651.
    
    We are going to switch to the whitelist kmem accounting policy, so zap
    every usage of __GFP_NOACCOUNT.
    
    Signed-off-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 fs/sysfs/dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index b4a7fda..620a402 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -269,7 +269,7 @@ static int sysfs_alloc_ino(unsigned int *pino)
 	spin_unlock(&sysfs_ino_lock);
 
 	if (rc == -EAGAIN) {
-		if (ida_pre_get(&sysfs_ino_ida, GFP_KERNEL | __GFP_NOACCOUNT))
+		if (ida_pre_get(&sysfs_ino_ida, GFP_KERNEL))
 			goto retry;
 		rc = -ENOMEM;
 	}