diff options
Diffstat (limited to 'fs/ntfs3/xattr.c')
| -rw-r--r-- | fs/ntfs3/xattr.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c index 6b17d46b9506..af89e50f7b9f 100644 --- a/fs/ntfs3/xattr.c +++ b/fs/ntfs3/xattr.c @@ -110,7 +110,7 @@ static int ntfs_read_ea(struct ntfs_inode *ni, struct EA_FULL **ea, return -EFBIG; /* Allocate memory for packed Ea */ - ea_p = ntfs_malloc(size + add_bytes); + ea_p = kmalloc(size + add_bytes, GFP_NOFS); if (!ea_p) return -ENOMEM; @@ -142,7 +142,7 @@ static int ntfs_read_ea(struct ntfs_inode *ni, struct EA_FULL **ea, return 0; out: - ntfs_free(ea_p); + kfree(ea_p); *ea = NULL; return err; } @@ -193,7 +193,7 @@ static ssize_t ntfs_list_ea(struct ntfs_inode *ni, char *buffer, } out: - ntfs_free(ea_all); + kfree(ea_all); return err ? err : ret; } @@ -251,7 +251,7 @@ static int ntfs_get_ea(struct inode *inode, const char *name, size_t name_len, err = 0; out: - ntfs_free(ea_all); + kfree(ea_all); if (!required) ni_unlock(ni); @@ -352,7 +352,7 @@ static noinline int ntfs_set_ea(struct inode *inode, const char *name, } if (!ea_all) { - ea_all = ntfs_zalloc(add); + ea_all = kzalloc(add, GFP_NOFS); if (!ea_all) { err = -ENOMEM; goto out; @@ -474,7 +474,7 @@ out: ni_unlock(ni); run_close(&ea_run); - ntfs_free(ea_all); + kfree(ea_all); return err; } @@ -599,7 +599,7 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns, value = NULL; } else { size = posix_acl_xattr_size(acl->a_count); - value = ntfs_malloc(size); + value = kmalloc(size, GFP_NOFS); if (!value) return -ENOMEM; @@ -614,7 +614,7 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns, set_cached_acl(inode, type, acl); out: - ntfs_free(value); + kfree(value); return err; } @@ -880,7 +880,7 @@ static int ntfs_getxattr(const struct xattr_handler *handler, struct dentry *de, err = sd_size; memcpy(buffer, sd, sd_size); } - ntfs_free(sd); + kfree(sd); goto out; } |