X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=fs%2Ff2fs%2Facl.c;h=a31c7e859af6e5ecb9c22463de61e95e02e92886;hb=aabb406008fc722ff2c992867d755ec2176e55b5;hp=6f1fdda977b396839d7804fc4fcdb4a948895b53;hpb=03b979dd0323ace8e29a0561cd5232f73a060c09;p=cascardo%2Flinux.git diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c index 6f1fdda977b3..a31c7e859af6 100644 --- 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,