From: Timothy Day <timday@amazon.com>
Date: Wed, 14 Aug 2024 14:02:55 +0000 (-0400)
Subject: LU-18141 libcfs: don't emit a warning for LIBCFS_FREE(NULL)
X-Git-Tag: 2.15.90~17
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f6dfa4f167f6354e43c574a9f3e28ce705783cfb;p=fs%2Flustre-release.git

LU-18141 libcfs: don't emit a warning for LIBCFS_FREE(NULL)

There is no need to emit a console message when doing
a LIBCFS_FREE() of NULL. We ought to silently accept
NULL and do nothing.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Change-Id: If7217f4791998b15e92485a80b6f2ed051f7eecc
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56050
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: jsimmons <jsimmons@infradead.org>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/libcfs/include/libcfs/libcfs_private.h b/libcfs/include/libcfs/libcfs_private.h
index e1110d7..927e4ae 100644
--- a/libcfs/include/libcfs/libcfs_private.h
+++ b/libcfs/include/libcfs/libcfs_private.h
@@ -228,16 +228,13 @@ do {									    \
 #define LIBCFS_FREE(ptr, size)						\
 do {									\
 	size_t s = (size);						\
-	if (unlikely((ptr) == NULL)) {					\
-		CERROR("LIBCFS: free NULL '" #ptr "' (%zd bytes) at "	\
-		       "%s:%d\n", s, __FILE__, __LINE__);		\
-		break;							\
+	if (likely(ptr)) {						\
+		LIBCFS_FREE_PRE(ptr, (size), "kfreed");			\
+		if (unlikely(s > LIBCFS_VMALLOC_SIZE))			\
+			libcfs_vfree_atomic(ptr);			\
+		else							\
+			kfree(ptr);					\
 	}								\
-	LIBCFS_FREE_PRE(ptr, (size), "kfreed");				\
-	if (unlikely(s > LIBCFS_VMALLOC_SIZE))				\
-		libcfs_vfree_atomic(ptr);				\
-	else								\
-		kfree(ptr);						\
 } while (0)
 
 /******************************************************************************/