Skip to contentSkip to conversation

staging: lustre: acl: Remove lustre_posix_acl_xattr_free wrapper

PATCH In review Shivani Bhardwaj 4 participants 5 messages Nov 9, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/staging/lustre/lustre/include/lustre_eacl.h | 2 --
 drivers/staging/lustre/lustre/llite/xattr.c         | 5 ++++-
 drivers/staging/lustre/lustre/obdclass/acl.c        | 9 ---------
 3 files changed, 4 insertions(+), 12 deletions(-)
drivers/staging/lustre/lustre/include/lustre_eacl.h +0 -2
index fee4d2c..0b66593 100644
@@ -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
index 4b7eb33..f9b1dee 100644
@@ -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
index 2e20cf6..49ba885 100644
@@ -236,15 +236,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.
  */
 void lustre_ext_acl_xattr_free(ext_acl_xattr_header *header)
Signature · 1 line
2.1.0
#1 lore raw

[PATCH] staging: lustre: acl: fix ifnullfree.cocci warnings

drivers/staging/lustre/lustre/llite/xattr.c:199:2-7: WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider…

drivers/staging/lustre/lustre/llite/xattr.c:199:2-7: WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider reorganizing relevant code to avoid passing NULL values.

NULL check before some freeing functions is not needed.

Based on checkpatch warning
"kfree(NULL) is safe this check is probably not required" and kfreeaddr.cocci by Julia Lawall.

Generated by: scripts/coccinelle/free/ifnullfree.cocci

CC Shivani Bhardwaj <[email protected]>

---

 xattr.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/lustre/lustre/llite/xattr.c +1 -2
@@ -192,11 +192,10 @@ int ll_setxattr_common(struct inode *ino
 			 valid, name, pv, size, 0, flags,
 			 ll_i2suppgid(inode), &req);
 #ifdef CONFIG_FS_POSIX_ACL
-	if (new_value != NULL)
 		/*
 		 * Release the posix ACL space.
 		 */
-		kfree(new_value);
+	kfree(new_value);
 	if (acl != NULL)
 		lustre_ext_acl_xattr_free(acl);
 #endif
maintainer
#2 lore raw

Re: [PATCH] staging: lustre: acl: fix ifnullfree.cocci warnings

Quoted 20 lines · kbuild test robot

drivers/staging/lustre/lustre/llite/xattr.c:199:2-7: WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider reorganizing relevant code to avoid passing NULL values.

NULL check before some freeing functions is not needed.

Based on checkpatch warning
"kfree(NULL) is safe this check is probably not required" and kfreeaddr.cocci by Julia Lawall.

Generated by: scripts/coccinelle/free/ifnullfree.cocci

CC Shivani Bhardwaj <[email protected]>

---

 xattr.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/staging/lustre/lustre/llite/xattr.c int ll_setxattr_common(struct inode *ino · line 198

Quoted 9 lines
drivers/staging/lustre/lustre/llite/xattr.c +1 -2
@@ -192,11 +192,10 @@ int ll_setxattr_common(struct inode *ino
 			 valid, name, pv, size, 0, flags,
 			 ll_i2suppgid(inode), &req);
 #ifdef CONFIG_FS_POSIX_ACL
-	if (new_value != NULL)
 		/*
 		 * Release the posix ACL space.
 		 */
-		kfree(new_value);
+	kfree(new_value);

Looks like a bug in coccinelle, the comment line should also be indented to the left.

Julia, any ideas?

thanks,

greg k-h

#3 lore raw

Re: [PATCH] staging: lustre: acl: fix ifnullfree.cocci warnings

Quoted 34 lines · Greg KH
Quoted 20 lines · kbuild test robot

drivers/staging/lustre/lustre/llite/xattr.c:199:2-7: WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider reorganizing relevant code to avoid passing NULL values.

NULL check before some freeing functions is not needed.

Based on checkpatch warning
"kfree(NULL) is safe this check is probably not required" and kfreeaddr.cocci by Julia Lawall.

Generated by: scripts/coccinelle/free/ifnullfree.cocci

CC Shivani Bhardwaj <[email protected]>

---

 xattr.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/staging/lustre/lustre/llite/xattr.c int ll_setxattr_common(struct inode *ino · line 198

Quoted 9 lines
drivers/staging/lustre/lustre/llite/xattr.c +1 -2
@@ -192,11 +192,10 @@ int ll_setxattr_common(struct inode *ino
 			 valid, name, pv, size, 0, flags,
 			 ll_i2suppgid(inode), &req);
 #ifdef CONFIG_FS_POSIX_ACL
-	if (new_value != NULL)
 		/*
 		 * Release the posix ACL space.
 		 */
-		kfree(new_value);
+	kfree(new_value);

Looks like a bug in coccinelle, the comment line should also be indented to the left.

Quoted 1 line

Julia, any ideas?

I think it's on the border of what the person is going to have to resign themselves to doing by hand. I'm not sure which side of the border it is on, but I try to focus more on getting the code printed in the right place than on the comments. I can check on it, though, and maybe an easy fix is possible.

thanks,
julia

#4 lore raw
In reply to Shivani Bhardwaj
url: https://github.com/0day-ci/linux/commits/Shivani-Bhardwaj/staging-lustre-acl-Remove-lustre_posix_acl_xattr_free-wrapper/20151110-025757

Hi Shivani,

[auto build test WARNING on staging/staging-testing] [also build test WARNING on v4.3 next-20151109]

url: https://github.com/0day-ci/linux/commits/Shivani-Bhardwaj/staging-lustre-acl-Remove-lustre_posix_acl_xattr_free-wrapper/20151110-025757

coccinelle warnings: (new ones prefixed by >>)

>> drivers/staging/lustre/lustre/llite/xattr.c:199:2-7: WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider reorganizing relevant code to avoid passing NULL values.

Please review and possibly fold the followup patch.

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation