staging: lustre: libcfs: remove NULL comparisons in headers

Remove the NULL comparisions in the libcfs headers.

Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
index 85661b3..d0ba3e0 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
@@ -818,7 +818,7 @@ cfs_hash_djb2_hash(const void *key, size_t size, unsigned int mask)
 {
        unsigned int i, hash = 5381;
 
-       LASSERT(key != NULL);
+       LASSERT(key);
 
        for (i = 0; i < size; i++)
                hash = hash * 33 + ((char *)key)[i];

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index 93bff1b..fc180b8 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -96,7 +96,7 @@ do {                                                                      \
 
 #define LIBCFS_ALLOC_POST(ptr, size)                                       \
 do {                                                                       \
-       if (unlikely((ptr) == NULL)) {                                      \
+       if (!unlikely((ptr))) {                                             \
                CERROR("LNET: out of memory at %s:%d (tried to alloc '"     \
                       #ptr "' = %d)\n", __FILE__, __LINE__, (int)(size));  \
        } else {                                                            \
@@ -147,7 +147,7 @@ do {                                                                            \
 
 #define LIBCFS_FREE(ptr, size)                                   \
 do {                                                               \
-       if (unlikely((ptr) == NULL)) {                            \
+       if (!unlikely((ptr))) {                                         \
                CERROR("LIBCFS: free NULL '" #ptr "' (%d bytes) at "    \
                       "%s:%d\n", (int)(size), __FILE__, __LINE__);     \
                break;                                            \