mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
bonding: Return nothing for not applicable values
From: Wagner Ferenc <wferi@niif.hu> The previous code returned '\n' (that is, a single empty line) from most files, with one exception (xmit_hash_policy), where it returned 'NA\n'. This patch consolidates each file to return nothing at all if not applicable, not even a '\n'. I find this behaviour more usual, more useful, more efficient and shorter to code from both sides. Signed-off-by: Ferenc Wagner <wferi@niif.hu> Acked-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
7bd4650895
commit
16cd0160d5
1 changed files with 4 additions and 21 deletions
|
@ -455,14 +455,11 @@ static ssize_t bonding_show_xmit_hash(struct device *d,
|
|||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
int count;
|
||||
int count = 0;
|
||||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if ((bond->params.mode != BOND_MODE_XOR) &&
|
||||
(bond->params.mode != BOND_MODE_8023AD)) {
|
||||
// Not Applicable
|
||||
count = sprintf(buf, "NA\n");
|
||||
} else {
|
||||
if ((bond->params.mode == BOND_MODE_XOR) ||
|
||||
(bond->params.mode == BOND_MODE_8023AD)) {
|
||||
count = sprintf(buf, "%s %d\n",
|
||||
xmit_hashtype_tbl[bond->params.xmit_policy].modename,
|
||||
bond->params.xmit_policy);
|
||||
|
@ -1079,8 +1076,6 @@ static ssize_t bonding_show_primary(struct device *d,
|
|||
|
||||
if (bond->primary_slave)
|
||||
count = sprintf(buf, "%s\n", bond->primary_slave->dev->name);
|
||||
else
|
||||
count = sprintf(buf, "\n");
|
||||
|
||||
return count;
|
||||
}
|
||||
|
@ -1186,7 +1181,7 @@ static ssize_t bonding_show_active_slave(struct device *d,
|
|||
{
|
||||
struct slave *curr;
|
||||
struct bonding *bond = to_bond(d);
|
||||
int count;
|
||||
int count = 0;
|
||||
|
||||
read_lock(&bond->curr_slave_lock);
|
||||
curr = bond->curr_active_slave;
|
||||
|
@ -1194,8 +1189,6 @@ static ssize_t bonding_show_active_slave(struct device *d,
|
|||
|
||||
if (USES_PRIMARY(bond->params.mode) && curr)
|
||||
count = sprintf(buf, "%s\n", curr->dev->name);
|
||||
else
|
||||
count = sprintf(buf, "\n");
|
||||
return count;
|
||||
}
|
||||
|
||||
|
@ -1309,8 +1302,6 @@ static ssize_t bonding_show_ad_aggregator(struct device *d,
|
|||
struct ad_info ad_info;
|
||||
count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ? 0 : ad_info.aggregator_id);
|
||||
}
|
||||
else
|
||||
count = sprintf(buf, "\n");
|
||||
|
||||
return count;
|
||||
}
|
||||
|
@ -1331,8 +1322,6 @@ static ssize_t bonding_show_ad_num_ports(struct device *d,
|
|||
struct ad_info ad_info;
|
||||
count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ? 0: ad_info.ports);
|
||||
}
|
||||
else
|
||||
count = sprintf(buf, "\n");
|
||||
|
||||
return count;
|
||||
}
|
||||
|
@ -1353,8 +1342,6 @@ static ssize_t bonding_show_ad_actor_key(struct device *d,
|
|||
struct ad_info ad_info;
|
||||
count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ? 0 : ad_info.actor_key);
|
||||
}
|
||||
else
|
||||
count = sprintf(buf, "\n");
|
||||
|
||||
return count;
|
||||
}
|
||||
|
@ -1375,8 +1362,6 @@ static ssize_t bonding_show_ad_partner_key(struct device *d,
|
|||
struct ad_info ad_info;
|
||||
count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ? 0 : ad_info.partner_key);
|
||||
}
|
||||
else
|
||||
count = sprintf(buf, "\n");
|
||||
|
||||
return count;
|
||||
}
|
||||
|
@ -1401,8 +1386,6 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
|
|||
print_mac(mac, ad_info.partner_system));
|
||||
}
|
||||
}
|
||||
else
|
||||
count = sprintf(buf, "\n");
|
||||
|
||||
return count;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue