fuse: kmemcg account fs data

account per-file, dentry, and inode data

blockdev/superblock and temporary per-request data was left alone, as
this usually isn't accounted

Reviewed-by: Shakeel Butt <shakeelb@google.com>
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 58557d4817e9d4734ebbf8fd27e5998a2ea706f4..d572c900bb0f208c6a49a43b97ece1cb882687f7 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -279,7 +279,8 @@ invalid:
 #if BITS_PER_LONG < 64
 static int fuse_dentry_init(struct dentry *dentry)
 {
-       dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), GFP_KERNEL);
+       dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry),
+                                  GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE);
 
        return dentry->d_fsdata ? 0 : -ENOMEM;
 }

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 8c7578b95d2c759a51a3ec5b63f3039c56a44b4d..0f0225686aeeb2acfbeff178bfd2434e4ea80795 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -63,12 +63,13 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc)
 {
        struct fuse_file *ff;
 
-       ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL);
+       ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL_ACCOUNT);
        if (unlikely(!ff))
                return NULL;
 
        ff->fc = fc;
-       ff->release_args = kzalloc(sizeof(*ff->release_args), GFP_KERNEL);
+       ff->release_args = kzalloc(sizeof(*ff->release_args),
+                                  GFP_KERNEL_ACCOUNT);
        if (!ff->release_args) {
                kfree(ff);
                return NULL;

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 10d193b24fb854fc5467d6294b5db996d0c15c0f..51cb471f4dc3a2ad77466e8edace524e2a60e34d 100644 (file)
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -66,7 +66,7 @@ static struct file_system_type fuseblk_fs_type;
 
 struct fuse_forget_link *fuse_alloc_forget(void)
 {
-       return kzalloc(sizeof(struct fuse_forget_link), GFP_KERNEL);
+       return kzalloc(sizeof(struct fuse_forget_link), GFP_KERNEL_ACCOUNT);
 }
 
 static struct inode *fuse_alloc_inode(struct super_block *sb)