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

Commit 6c441b97 authored Feb 18, 2016 by Janani Ravichandran Committed by Greg Kroah-Hartman Feb 20, 2016

staging: lustre: lustre: Remove unneeded else after goto

Remove unnecessary else following an if block with a goto statement.

Signed-off-by: Janani Ravichandran <janani.rvchndrn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7d51a7da

drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -850,7 +850,8 @@ cfs_cpt_table_create_pattern(char *pattern)
		if (*str != 0) {
		CERROR("Invalid pattern %s\n", str);
		goto failed;
		} else if (c != ncpt) {
		}
		if (c != ncpt) {
		CERROR("expect %d partitions but found %d\n",
		ncpt, c);
		goto failed;

drivers/staging/lustre/lustre/lov/lov_obd.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -399,10 +399,9 @@ static int lov_set_osc_active(struct obd_device obd, struct obd_uuid uuid,
		CDEBUG(D_INFO, "OSC %s already %sactive!\n",
		uuid->uuid, active ? "" : "in");
		goto out;
		} else {
		}
		CDEBUG(D_CONFIG, "Marking OSC %s %sactive\n",
		obd_uuid2str(uuid), active ? "" : "in");
		}

		lov->lov_tgts[index]->ltd_active = active;
		if (active) {

drivers/staging/lustre/lustre/lov/lov_pack.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -402,7 +402,8 @@ int lov_getstripe(struct obd_export exp, struct lov_stripe_md lsm,
		if (copy_from_user(&lum, lump, lum_size)) {
		rc = -EFAULT;
		goto out_set;
		} else if ((lum.lmm_magic != LOV_USER_MAGIC) &&
		}
		if ((lum.lmm_magic != LOV_USER_MAGIC) &&
		(lum.lmm_magic != LOV_USER_MAGIC_V3)) {
		rc = -EINVAL;
		goto out_set;