Merge tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[mirror_ubuntu-hirsute-kernel.git] / drivers / staging / lustre / lustre / llite / xattr.c

diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 660b8ac37ae0c62fa2f66a38f2c0733774382144..8eb43f192d1fa3fea8406ad61466c3fc21c1afe8 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -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