staging: lustre: fix integer as NULL pointer warnings

Fix several sparse warnings "Using plain integer as NULL pointer"

Signed-off-by: Alexandr Terekhov <a.terekhov@gmail.com>
 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 4 ++--
 drivers/staging/lustre/lustre/obdclass/obd_mount.c | 4 ++--
 drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 4 ++--
 drivers/staging/lustre/lustre/osc/osc_dev.c        | 2 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index a4cec5e63ce07cae7bc814cba4f201b29f7b1846..c55d72f79b263fea022eaeb47105bf9e63717f49 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -89,7 +89,7 @@ int ldlm_proc_setup(void)
 {
        int rc;
        struct lprocfs_vars list[] = {
-               { "dump_namespaces", &ldlm_dump_ns_fops, 0, 0222 },
+               { "dump_namespaces", &ldlm_dump_ns_fops, NULL, 0222 },
                { "dump_granted_max", &ldlm_rw_uint_fops,
                  &ldlm_dump_granted_max },
                { "cancel_unused_locks_before_replay", &ldlm_rw_uint_fops,
@@ -322,7 +322,7 @@ void ldlm_namespace_proc_unregister(struct ldlm_namespace *ns)
                snprintf(lock_name, MAX_STRING_SIZE, name);     \
                lock_vars[0].data = var;                        \
                lock_vars[0].fops = ops;                        \
-               lprocfs_add_vars(ns_pde, lock_vars, 0);         \
+               lprocfs_add_vars(ns_pde, lock_vars, NULL);      \
        } while (0)
 
 int ldlm_namespace_proc_register(struct ldlm_namespace *ns)

diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
index 419a32361359d16f0f0c437fc4bf069d34ec1c00..a034aee37fc1d6dcb9b6246db814095ad3dd884c 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
@@ -383,7 +383,7 @@ int lustre_start_mgc(struct super_block *sb)
        /* Start the MGC */
        rc = lustre_start_simple(mgcname, LUSTRE_MGC_NAME,
                                 (char *)uuid->uuid, LUSTRE_MGS_OBDNAME,
-                                niduuid, 0, 0);
+                                niduuid, NULL, NULL);
        OBD_FREE_PTR(uuid);
        if (rc)
                GOTO(out_free, rc);
@@ -482,7 +482,7 @@ static int lustre_stop_mgc(struct super_block *sb)
 {
        struct lustre_sb_info *lsi = s2lsi(sb);
        struct obd_device *obd;
-       char *niduuid = 0, *ptr = 0;
+       char *niduuid = NULL, *ptr = NULL;
        int i, rc = 0, len = 0;
 
        if (!lsi)

diff --git a/drivers/staging/lustre/lustre/obdecho/lproc_echo.c b/drivers/staging/lustre/lustre/obdecho/lproc_echo.c
index b9abac1c4dcacc4ad3aca8bbae18a6de03295465..8fe9245a8aad90899c95a1f1fe9c71d0e4ad2f36 100644 (file)
--- a/drivers/staging/lustre/lustre/obdecho/lproc_echo.c
+++ b/drivers/staging/lustre/lustre/obdecho/lproc_echo.c
@@ -39,13 +39,13 @@
 #ifdef LPROCFS
 LPROC_SEQ_FOPS_RO_TYPE(echo, uuid);
 static struct lprocfs_vars lprocfs_echo_obd_vars[] = {
-       { "uuid",        &echo_uuid_fops,       0, 0 },
+       { "uuid",        &echo_uuid_fops,       NULL, 0 },
        { 0 }
 };
 
 LPROC_SEQ_FOPS_RO_TYPE(echo, numrefs);
 static struct lprocfs_vars lprocfs_echo_module_vars[] = {
-       { "num_refs",     &echo_numrefs_fops,     0, 0 },
+       { "num_refs",     &echo_numrefs_fops,     NULL, 0 },
        { 0 }
 };
 

diff --git a/drivers/staging/lustre/lustre/osc/osc_dev.c b/drivers/staging/lustre/lustre/osc/osc_dev.c
index 6a6483920c4d9b84f1f58b41a9d833864de533f7..a7c1ec0d56feb2d79895bc97eed29f5b035a0fe9 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_dev.c
+++ b/drivers/staging/lustre/lustre/osc/osc_dev.c
@@ -193,7 +193,7 @@ static int osc_device_init(const struct lu_env *env, struct lu_device *d,
 static struct lu_device *osc_device_fini(const struct lu_env *env,
                                         struct lu_device *d)
 {
-       return 0;
+       return NULL;
 }
 
 static struct lu_device *osc_device_free(const struct lu_env *env,

diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
index 1c73194421a6ccb2126f39584f71ebf545b9a8d8..8573f328bd2a5ae92abad1e8df5c69ab7469bb55 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/import.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
@@ -645,7 +645,7 @@ int ptlrpc_connect_import(struct obd_import *imp)
        if (rc)
                GOTO(out, rc);
 
-       rc = sptlrpc_import_sec_adapt(imp, NULL, 0);
+       rc = sptlrpc_import_sec_adapt(imp, NULL, NULL);
        if (rc)
                GOTO(out, rc);