Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1340039

[PATCH 10/24] staging: lustre: missed a few cases of using NULL instead of 0

Show all headers | View raw

From: Frank Zago <fzago@cray.com>

It is preferable to use NULL instead of 0 for pointers. This fixes sparse
warnings such as:

lustre/fld/fld_request.c:126:17: warning: Using plain integer as NULL pointer

The second parameter of class_match_param() was changed to a const, to
be able to remove a cast in one user, to prevent splitting a long
line. No other code change.

Signed-off-by: Frank Zago <fzago@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5396
Reviewed-on: http://review.whamcloud.com/12567
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 drivers/staging/lustre/lnet/lnet/api-ni.c          |    2 +-
 drivers/staging/lustre/lustre/llite/llite_lib.c    |    2 +-
 .../staging/lustre/lustre/obdclass/obd_config.c    |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 3b7bc36..f223d5d 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -904,7 +904,7 @@ lnet_ping_info_setup(lnet_ping_info_t **ppinfo, lnet_handle_md_t *md_handle,
 {
 	lnet_process_id_t id = {LNET_NID_ANY, LNET_PID_ANY};
 	lnet_handle_me_t me_handle;
-	lnet_md_t md = {0};
+	lnet_md_t md = { NULL };
 	int rc, rc2;
 
 	if (set_eq) {
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 4de085d..2440b07 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1940,7 +1940,7 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
 		  struct super_block *sb, struct lookup_intent *it)
 {
 	struct ll_sb_info *sbi = NULL;
-	struct lustre_md md;
+	struct lustre_md md = { NULL };
 	int rc;
 
 	LASSERT(*inode || sb);
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_config.c b/drivers/staging/lustre/lustre/obdclass/obd_config.c
index c4128ac..6417946 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_config.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_config.c
@@ -72,7 +72,7 @@ EXPORT_SYMBOL(class_find_param);
 
 /* returns 0 if this is the first key in the buffer, else 1.
    valp points to first char after key. */
-static int class_match_param(char *buf, char *key, char **valp)
+static int class_match_param(char *buf, const char *key, char **valp)
 {
 	if (!buf)
 		return 1;
@@ -1008,7 +1008,7 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
 		/* Search proc entries */
 		while (lvars[j].name) {
 			var = &lvars[j];
-			if (class_match_param(key, (char *)var->name, NULL) == 0
+			if (!class_match_param(key, var->name, NULL)
 			    && keylen == strlen(var->name)) {
 				matched++;
 				rc = -EROFS;
-- 
1.7.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/24] Second batch of LNet updates James Simmons <jsimmons@infradead.org> - 2016-02-22 23:30 +0100
  [PATCH 17/24] staging: lustre: prevent assert on LNet module unload James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 24/24] staging: lustre: Remove LASSERTS from router checker James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 19/24] staging: lustre: remove unnecessary EXPORT_SYMBOL from lnet layer James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 01/24] staging: lustre: Dynamic LNet Configuration (DLC) IOCTL changes James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 07/24] staging: lustre: improve LNet clean up code and API James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 23/24] staging: lustre: Use lnet_is_route_alive for router aliveness James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 22/24] staging: lustre: Allocate the correct number of rtr buffers James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 20/24] staging: lustre: avoid race during lnet acceptor thread termination James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 11/24] staging: lustre: startup lnet acceptor thread dynamically James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 09/24] staging: lustre: make some lnet functions static James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 04/24] staging: lustre: DLC user/kernel space glue code James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 13/24] staging: lustre: return -EEXIST if NI is not unique James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 03/24] staging: lustre: fix crash due to NULL networks string James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 21/24] staging: lustre: use sock.h in only acceptor.c James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 18/24] staging: lustre: remove messages from lazy portal on NI shutdown James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 05/24] staging: lustre: make local functions static for LNet ni James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 06/24] staging: lustre: remove LUSTRE_{,SRV_}LNET_PID James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 16/24] staging: lustre: assume a kernel build James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 10/24] staging: lustre: missed a few cases of using NULL instead of 0 James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 14/24] staging: lustre: handle lnet_check_routes() errors James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 08/24] staging: lustre: return appropriate errno when adding route James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100
  [PATCH 12/24] staging: lustre: reject invalid net configuration for lnet James Simmons <jsimmons@infradead.org> - 2016-02-22 23:40 +0100

csiph-web