staging: lustre: acl: Remove lustre_posix_acl_xattr_free wrapper

Remove the wrapper function lustre_posix_acl_xattr_free() and replace its
call in the file xattr with the function kfree() that it wrapped. Also,
its prototype from the header lustre_eacl is removed as it is no longer
of any use.

Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre_eacl.h b/drivers/staging/lustre/lustre/include/lustre_eacl.h
index fee4d2c75506d528d2bafea196d92c5c5269c1db..0b66593a95263463ff093bda3b78cddc854b5a1c 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_eacl.h
+++ b/drivers/staging/lustre/lustre/include/lustre_eacl.h
@@ -76,8 +76,6 @@ extern int
 lustre_posix_acl_xattr_filter(posix_acl_xattr_header *header, size_t size,
                              posix_acl_xattr_header **out);
 extern void
-lustre_posix_acl_xattr_free(posix_acl_xattr_header *header, int size);
-extern void
 lustre_ext_acl_xattr_free(ext_acl_xattr_header *header);
 extern ext_acl_xattr_header *
 lustre_acl_xattr_merge2ext(posix_acl_xattr_header *posix_header, int size,

diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 92f579e51cf2e80e5f98452242724d4ab5ce7eb6..4d91538668acfbd874d9ad88e55c3020e9050ace 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -193,7 +193,10 @@ int ll_setxattr_common(struct inode *inode, const char *name,
                         ll_i2suppgid(inode), &req);
 #ifdef CONFIG_FS_POSIX_ACL
        if (new_value != NULL)
-               lustre_posix_acl_xattr_free(new_value, size);
+               /*
+                * Release the posix ACL space.
+                */
+               kfree(new_value);
        if (acl != NULL)
                lustre_ext_acl_xattr_free(acl);
 #endif

diff --git a/drivers/staging/lustre/lustre/obdclass/acl.c b/drivers/staging/lustre/lustre/obdclass/acl.c
index 2e20cf635b2779ebd7062f18ac348368da788d65..49ba8851c8ac709eaa14e3e5e67c264081f792e5 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/acl.c
+++ b/drivers/staging/lustre/lustre/obdclass/acl.c
@@ -235,15 +235,6 @@ _out:
 }
 EXPORT_SYMBOL(lustre_posix_acl_xattr_filter);
 
-/*
- * Release the posix ACL space.
- */
-void lustre_posix_acl_xattr_free(posix_acl_xattr_header *header, int size)
-{
-       kfree(header);
-}
-EXPORT_SYMBOL(lustre_posix_acl_xattr_free);
-
 /*
  * Release the extended ACL space.
  */