Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df3c9577 authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman
Browse files

staging: lustre: use NULL instead of 0 for pointer 



Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 81fb955d

drivers/staging/lustre/lustre/obdclass/obd_mount.c

+10 −8
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int lustre_start_simple(char *obdname, char *type, char *uuid, 
	int rc;

	CDEBUG(D_MOUNT, "Starting obd %s (typ=%s)\n", obdname, type);



	rc = do_lcfg(obdname, 0, LCFG_ATTACH, type, uuid, 0, 0);

	rc = do_lcfg(obdname, 0, LCFG_ATTACH, type, uuid, NULL, NULL);

	if (rc) {

		CERROR("%s attach error %d\n", obdname, rc);

		return rc;
@@ -195,7 +195,7 @@ int lustre_start_simple(char *obdname, char *type, char *uuid, 
	rc = do_lcfg(obdname, 0, LCFG_SETUP, s1, s2, s3, s4);

	if (rc) {

		CERROR("%s setup error %d\n", obdname, rc);

		do_lcfg(obdname, 0, LCFG_DETACH, 0, 0, 0, 0);

		do_lcfg(obdname, 0, LCFG_DETACH, NULL, NULL, NULL, NULL);

	}

	return rc;

}
@@ -337,7 +337,8 @@ int lustre_start_mgc(struct super_block *sb) 
			lnet_process_id_t id;

			while ((rc = LNetGetId(i++, &id)) != -ENOENT) {

				rc = do_lcfg(mgcname, id.nid,

					     LCFG_ADD_UUID, niduuid, 0,0,0);

					     LCFG_ADD_UUID, niduuid,

					     NULL, NULL, NULL);

			}

		} else {

			/* Use mgsnode= nids */
@@ -351,7 +352,8 @@ int lustre_start_mgc(struct super_block *sb) 
			}

			while (class_parse_nid(ptr, &nid, &ptr) == 0) {

				rc = do_lcfg(mgcname, nid,

					     LCFG_ADD_UUID, niduuid, 0,0,0);

					     LCFG_ADD_UUID, niduuid,

					     NULL, NULL, NULL);

				i++;

			}

		}
@@ -360,7 +362,7 @@ int lustre_start_mgc(struct super_block *sb) 
		ptr = lsi->lsi_lmd->lmd_dev;

		while (class_parse_nid(ptr, &nid, &ptr) == 0) {

			rc = do_lcfg(mgcname, nid,

				     LCFG_ADD_UUID, niduuid, 0,0,0);

				     LCFG_ADD_UUID, niduuid, NULL, NULL, NULL);

			i++;

			/* Stop at the first failover nid */

			if (*ptr == ':')
@@ -396,13 +398,13 @@ int lustre_start_mgc(struct super_block *sb) 
		while (class_parse_nid_quiet(ptr, &nid, &ptr) == 0) {

			j++;

			rc = do_lcfg(mgcname, nid,

				     LCFG_ADD_UUID, niduuid, 0,0,0);

				     LCFG_ADD_UUID, niduuid, NULL, NULL, NULL);

			if (*ptr == ':')

				break;

		}

		if (j > 0) {

			rc = do_lcfg(mgcname, 0, LCFG_ADD_CONN,

				     niduuid, 0, 0, 0);

				     niduuid, NULL, NULL, NULL);

			i++;

		} else {

			/* at ":/fsname" */
@@ -532,7 +534,7 @@ static int lustre_stop_mgc(struct super_block *sb) 
	for (i = 0; i < lsi->lsi_lmd->lmd_mgs_failnodes; i++) {

		sprintf(ptr, "_%x", i);

		rc = do_lcfg(LUSTRE_MGC_OBDNAME, 0, LCFG_DEL_UUID,

			     niduuid, 0, 0, 0);

			     niduuid, NULL, NULL, NULL);

		if (rc)

			CERROR("del MDC UUID %s failed: rc = %d\n",

			       niduuid, rc);