bonding: convert primary to use the new option API (180222f0) · Commits · 戴 / test

drivers/net/bonding/bond_netlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,8 @@ static int bond_changelink(struct net_device *bond_dev,
		if (dev)
		primary = dev->name;

		err = bond_option_primary_set(bond, primary);
		bond_opt_initstr(&newval, primary);
		err = __bond_opt_set(bond, BOND_OPT_PRIMARY, &newval);
		if (err)
		return err;
		}

+16 −10

Original line number	Diff line number	Diff line
		@@ -207,6 +207,16 @@ static struct bond_option bond_opts[] = {
		.values = bond_intmax_tbl,
		.set = bond_option_miimon_set
		},
		[BOND_OPT_PRIMARY] = {
		.id = BOND_OPT_PRIMARY,
		.name = "primary",
		.desc = "Primary network device to use",
		.flags = BOND_OPTFLAG_RAWVAL,
		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_ACTIVEBACKUP) \|
		BIT(BOND_MODE_TLB) \|
		BIT(BOND_MODE_ALB)),
		.set = bond_option_primary_set
		},
		{ }
		};

		@@ -885,23 +895,19 @@ int bond_option_arp_all_targets_set(struct bonding *bond,
		return 0;
		}

		int bond_option_primary_set(struct bonding bond, const char primary)
		int bond_option_primary_set(struct bonding bond, struct bond_opt_value newval)
		{
		char p, primary = newval->string;
		struct list_head *iter;
		struct slave *slave;
		int err = 0;

		block_netpoll_tx();
		read_lock(&bond->lock);
		write_lock_bh(&bond->curr_slave_lock);

		if (!USES_PRIMARY(bond->params.mode)) {
		pr_err("%s: Unable to set primary slave; %s is in mode %d\n",
		bond->dev->name, bond->dev->name, bond->params.mode);
		err = -EINVAL;
		goto out;
		}

		p = strchr(primary, '\n');
		if (p)
		*p = '\0';
		/* check to see if we are clearing primary */
		if (!strlen(primary)) {
		pr_info("%s: Setting primary slave to None.\n",
		@@ -934,7 +940,7 @@ out:
		read_unlock(&bond->lock);
		unblock_netpoll_tx();

		return err;
		return 0;
		}

		int bond_option_primary_reselect_set(struct bonding *bond, int primary_reselect)

+3 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ enum {
		BOND_OPT_AD_SELECT,
		BOND_OPT_NUM_PEER_NOTIF,
		BOND_OPT_MIIMON,
		BOND_OPT_PRIMARY,
		BOND_OPT_LAST
		};

		@@ -141,4 +142,6 @@ int bond_option_ad_select_set(struct bonding *bond,
		int bond_option_num_peer_notif_set(struct bonding *bond,
		struct bond_opt_value *newval);
		int bond_option_miimon_set(struct bonding bond, struct bond_opt_value newval);
		int bond_option_primary_set(struct bonding *bond,
		struct bond_opt_value *newval);
		#endif /* _BOND_OPTIONS_H */

+1 −10

Original line number	Diff line number	Diff line
		@@ -710,21 +710,12 @@ static ssize_t bonding_store_primary(struct device *d,
		const char *buf, size_t count)
		{
		struct bonding *bond = to_bond(d);
		char ifname[IFNAMSIZ];
		int ret;

		sscanf(buf, "%15s", ifname); /* IFNAMSIZ */
		if (ifname[0] == '\n')
		ifname[0] = '\0';

		if (!rtnl_trylock())
		return restart_syscall();

		ret = bond_option_primary_set(bond, ifname);
		ret = bond_opt_tryset_rtnl(bond, BOND_OPT_PRIMARY, (char *)buf);
		if (!ret)
		ret = count;

		rtnl_unlock();
		return ret;
		}
		static DEVICE_ATTR(primary, S_IRUGO \| S_IWUSR,

+0 −1

Original line number	Diff line number	Diff line
		@@ -456,7 +456,6 @@ int bond_option_active_slave_set(struct bonding bond, struct net_device slave_
		int bond_option_use_carrier_set(struct bonding *bond, int use_carrier);
		int bond_option_arp_ip_target_add(struct bonding *bond, __be32 target);
		int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target);
		int bond_option_primary_set(struct bonding bond, const char primary);
		int bond_option_primary_reselect_set(struct bonding *bond,
		int primary_reselect);
		int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp);