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

Commit 07ea81b6 authored by Dan Carpenter's avatar Dan Carpenter Committed by Nicholas Bellinger
Browse files

target: don't always say "ipv6" as address type 



"lstat->last_intr_fail_ip_addr" is an array inside the "lstat" struct.
It's never NULL so we always print "ipv6\n" here.  The test should be
"if (lstat->last_intr_fail_ip_family == AF_INET6)".

We don't need the temporary buffer either.  We could print directly into
"page".

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent d0c8b259

drivers/target/iscsi/iscsi_target_stat.c

+6 −4
Original line number Diff line number Diff line
@@ -410,14 +410,16 @@ static ssize_t iscsi_stat_tgt_attr_show_attr_fail_intr_addr_type( 
	struct iscsi_tiqn *tiqn = container_of(igrps,

			struct iscsi_tiqn, tiqn_stat_grps);

	struct iscsi_login_stats *lstat = &tiqn->login_stats;

	unsigned char buf[8];

	int ret;



	spin_lock(&lstat->lock);

	snprintf(buf, 8, "%s", (lstat->last_intr_fail_ip_addr != NULL) ?

				"ipv6" : "ipv4");

	if (lstat->last_intr_fail_ip_family == AF_INET6)

		ret = snprintf(page, PAGE_SIZE, "ipv6\n");

	else

		ret = snprintf(page, PAGE_SIZE, "ipv4\n");

	spin_unlock(&lstat->lock);



	return snprintf(page, PAGE_SIZE, "%s\n", buf);

	return ret;

}

ISCSI_STAT_TGT_ATTR_RO(fail_intr_addr_type);