f2fs: introduce f2fs_kmalloc to wrap kmalloc

This patch adds f2fs_kmalloc.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index c8f25f7241f06a96c3d99ebf5c82e53a6099ed60..d757d79a4d71af3da2f1bb9e93dd3e6e35d8c7df 100644 (file)
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -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,

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index dbfc1d1375a0cf7965ce0df3e8bcb4e0a7e3b921..6bd0595914051bcc91297ee45ede12555b540e77 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -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;
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6a482411e6d4771b1ede641e8abf639cc05e8443..879e4d77a1bca9aa85b6040291ce2ddce7a1b189 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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;

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 19e9fafc5c70062343b23224bab6f1d9c727e286..38d56f678912358e701d301d7cde694beda56563 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -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;

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index e61084cac5f19d7823e9259f8e1b9190ee924537..33830b251426741ca0b3266213a53067de1c0096 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -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;