Commit 97c2bb7b authored by Shivani Bhardwaj's avatar Shivani Bhardwaj Committed by Greg Kroah-Hartman
Browse files

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: default avatarShivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc210537

drivers/staging/lustre/lustre/include/lustre_eacl.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

drivers/staging/lustre/lustre/llite/xattr.c

+4 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/lustre/lustre/obdclass/acl.c

+0 −9
Original line number Diff line number Diff line
@@ -235,15 +235,6 @@ int lustre_posix_acl_xattr_filter(posix_acl_xattr_header *header, size_t size, 
}

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.

 */