diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2013-01-31 11:17:54 +0300 |
|---|---|---|
| committer |   Nicholas Bellinger <nab@linux-iscsi.org> | 2013-02-13 11:27:51 -0800 |
| commit | 07ea81b6f7d6345e146245c4964640a5a27b5cc5 (patch) | |
| tree | ac51b8c8445ace138389659e2994fa154b04e426 /drivers/target/iscsi/iscsi_target_stat.c | |
| parent | target/iblock: Use backend REQ_FLUSH hint for WriteCacheEnabled status (diff) | |
| download | linux-dev-07ea81b6f7d6345e146245c4964640a5a27b5cc5.tar.xz linux-dev-07ea81b6f7d6345e146245c4964640a5a27b5cc5.zip | |
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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi/iscsi_target_stat.c')
| -rw-r--r-- | drivers/target/iscsi/iscsi_target_stat.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/target/iscsi/iscsi_target_stat.c b/drivers/target/iscsi/iscsi_target_stat.c index 421d6947dc64..54a6f3834cf0 100644 --- a/drivers/target/iscsi/iscsi_target_stat.c +++ b/drivers/target/iscsi/iscsi_target_stat.c @@ -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); |