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

Commit 0414b004 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: introduce f2fs_kmalloc to wrap kmalloc 



This patch adds f2fs_kmalloc.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent f00d6fa7

fs/f2fs/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void *f2fs_acl_to_disk(const struct posix_acl *acl, size_t *size) 
	struct f2fs_acl_entry *entry;

	int i;



	f2fs_acl = kmalloc(sizeof(struct f2fs_acl_header) + acl->a_count *

	f2fs_acl = f2fs_kmalloc(sizeof(struct f2fs_acl_header) + acl->a_count *

			sizeof(struct f2fs_acl_entry), GFP_NOFS);

	if (!f2fs_acl)

		return ERR_PTR(-ENOMEM);
@@ -175,7 +175,7 @@ static struct posix_acl *__f2fs_get_acl(struct inode *inode, int type, 


	retval = f2fs_getxattr(inode, name_index, "", NULL, 0, dpage);

	if (retval > 0) {

		value = kmalloc(retval, GFP_F2FS_ZERO);

		value = f2fs_kmalloc(retval, GFP_F2FS_ZERO);

		if (!value)

			return ERR_PTR(-ENOMEM);

		retval = f2fs_getxattr(inode, name_index, "", value,

fs/f2fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 
			int save_len = fstr->len;

			int ret;



			de_name.name = kmalloc(de_name.len, GFP_NOFS);

			de_name.name = f2fs_kmalloc(de_name.len, GFP_NOFS);

			if (!de_name.name)

				return false;

fs/f2fs/f2fs.h

+5 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,11 @@ static inline bool f2fs_may_extent_tree(struct inode *inode) 
	return S_ISREG(inode->i_mode);

}



static inline void *f2fs_kmalloc(size_t size, gfp_t flags)

{

	return kmalloc(size, flags);

}



static inline void *f2fs_kvmalloc(size_t size, gfp_t flags)

{

	void *ret;

fs/f2fs/gc.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int start_gc_thread(struct f2fs_sb_info *sbi) 
	dev_t dev = sbi->sb->s_bdev->bd_dev;

	int err = 0;



	gc_th = kmalloc(sizeof(struct f2fs_gc_kthread), GFP_KERNEL);

	gc_th = f2fs_kmalloc(sizeof(struct f2fs_gc_kthread), GFP_KERNEL);

	if (!gc_th) {

		err = -ENOMEM;

		goto out;

fs/f2fs/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static int f2fs_move_rehashed_dirents(struct inode *dir, struct page *ipage, 
	struct f2fs_inline_dentry *backup_dentry;

	int err;



	backup_dentry = kmalloc(sizeof(struct f2fs_inline_dentry),

	backup_dentry = f2fs_kmalloc(sizeof(struct f2fs_inline_dentry),

							GFP_F2FS_ZERO);

	if (!backup_dentry)

		return -ENOMEM;