Browse Source

staging: lustre: libcfs: repair improper unlikely test

The scripts to replace NULL test got confused with the
macro parenthesis so the unlikely test in libcfs_private.h
ended up incorrect. This fixes this error.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
James Simmons 8 years ago
parent
commit
a4424bf50b
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/staging/lustre/include/linux/libcfs/libcfs_private.h

+ 2 - 2
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h

@@ -96,7 +96,7 @@ do {									    \
 
 
 #define LIBCFS_ALLOC_POST(ptr, size)					    \
 #define LIBCFS_ALLOC_POST(ptr, size)					    \
 do {									    \
 do {									    \
-	if (!unlikely((ptr))) {						    \
+	if (unlikely(!(ptr))) {						    \
 		CERROR("LNET: out of memory at %s:%d (tried to alloc '"	    \
 		CERROR("LNET: out of memory at %s:%d (tried to alloc '"	    \
 		       #ptr "' = %d)\n", __FILE__, __LINE__, (int)(size));  \
 		       #ptr "' = %d)\n", __FILE__, __LINE__, (int)(size));  \
 	} else {							    \
 	} else {							    \
@@ -147,7 +147,7 @@ do {									    \
 
 
 #define LIBCFS_FREE(ptr, size)					  \
 #define LIBCFS_FREE(ptr, size)					  \
 do {								    \
 do {								    \
-	if (!unlikely((ptr))) {						\
+	if (unlikely(!(ptr))) {						\
 		CERROR("LIBCFS: free NULL '" #ptr "' (%d bytes) at "    \
 		CERROR("LIBCFS: free NULL '" #ptr "' (%d bytes) at "    \
 		       "%s:%d\n", (int)(size), __FILE__, __LINE__);	\
 		       "%s:%d\n", (int)(size), __FILE__, __LINE__);	\
 		break;						  \
 		break;						  \