xfs: factor all the kmalloc-or-vmalloc fallback allocations
We have quite a few places now where we do:
x = kmem_zalloc(large size)
if (!x)
x = kmem_zalloc_large(large size)
and do a similar dance when freeing the memory. kmem_free() already
does the correct freeing dance, and kmem_zalloc_large() is only ever
called in these constructs, so just factor it all into
kmem_zalloc_large() and kmem_free().
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
index 4ea73cc..0e2f37e 100644
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@ -152,12 +152,9 @@
* go out to the disk.
*/
len = XFS_ACL_MAX_SIZE(ip->i_mount);
- xfs_acl = kmem_zalloc(len, KM_SLEEP | KM_MAYFAIL);
- if (!xfs_acl) {
- xfs_acl = kmem_zalloc_large(len);
- if (!xfs_acl)
- return ERR_PTR(-ENOMEM);
- }
+ xfs_acl = kmem_zalloc_large(len, KM_SLEEP);
+ if (!xfs_acl)
+ return ERR_PTR(-ENOMEM);
error = -xfs_attr_get(ip, ea_name, (unsigned char *)xfs_acl,
&len, ATTR_ROOT);
@@ -181,10 +178,7 @@
out_update_cache:
set_cached_acl(inode, type, acl);
out:
- if (is_vmalloc_addr(xfs_acl))
- kmem_free_large(xfs_acl);
- else
- kfree(xfs_acl);
+ kmem_free(xfs_acl);
return acl;
}
@@ -215,12 +209,9 @@
struct xfs_acl *xfs_acl;
int len = XFS_ACL_MAX_SIZE(ip->i_mount);
- xfs_acl = kmem_zalloc(len, KM_SLEEP | KM_MAYFAIL);
- if (!xfs_acl) {
- xfs_acl = kmem_zalloc_large(len);
- if (!xfs_acl)
- return -ENOMEM;
- }
+ xfs_acl = kmem_zalloc_large(len, KM_SLEEP);
+ if (!xfs_acl)
+ return -ENOMEM;
xfs_acl_to_disk(xfs_acl, acl);
@@ -231,10 +222,7 @@
error = -xfs_attr_set(ip, ea_name, (unsigned char *)xfs_acl,
len, ATTR_ROOT);
- if (is_vmalloc_addr(xfs_acl))
- kmem_free_large(xfs_acl);
- else
- kfree(xfs_acl);
+ kmem_free(xfs_acl);
} else {
/*
* A NULL ACL argument means we want to remove the ACL.