Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc69e98c authored by Khazhismel Kumykov's avatar Khazhismel Kumykov Committed by Miklos Szeredi
Browse files

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: default avatarShakeel Butt <shakeelb@google.com>
Signed-off-by: default avatarKhazhismel Kumykov <khazhy@google.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 30c6a23d

fs/fuse/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -279,7 +279,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) 
#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;

}

fs/fuse/file.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

fs/fuse/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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)