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

Commit 1c2c1b4f authored by Bart Van Assche's avatar Bart Van Assche Committed by Robert Love
Browse files

fcoe: Reduce fcoe_sysfs_fcf_add() stack usage 



This patch fixes the following compiler warning:

drivers/scsi/fcoe/fcoe_ctlr.c: In function fcoe_sysfs_fcf_add:
drivers/scsi/fcoe/fcoe_ctlr.c:211:1: warning: the frame size of 1480 bytes is larger than 1024 bytes [-Wframe-larger-than=]

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Cc: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
parent 465b87bf

drivers/scsi/fcoe/fcoe_ctlr.c

+23 −17
Original line number Diff line number Diff line
@@ -164,28 +164,30 @@ static int fcoe_sysfs_fcf_add(struct fcoe_fcf *new) 
{

	struct fcoe_ctlr *fip = new->fip;

	struct fcoe_ctlr_device *ctlr_dev = fcoe_ctlr_to_ctlr_dev(fip);

	struct fcoe_fcf_device temp, *fcf_dev;

	int rc = 0;

	struct fcoe_fcf_device *temp, *fcf_dev;

	int rc = -ENOMEM;



	LIBFCOE_FIP_DBG(fip, "New FCF fab %16.16llx mac %pM\n",

			new->fabric_name, new->fcf_mac);



	temp = kzalloc(sizeof(*temp), GFP_KERNEL);

	if (!temp)

		goto out;



	mutex_lock(&ctlr_dev->lock);



	temp.fabric_name = new->fabric_name;

	temp.switch_name = new->switch_name;

	temp.fc_map = new->fc_map;

	temp.vfid = new->vfid;

	memcpy(temp.mac, new->fcf_mac, ETH_ALEN);

	temp.priority = new->pri;

	temp.fka_period = new->fka_period;

	temp.selected = 0; /* default to unselected */



	fcf_dev = fcoe_fcf_device_add(ctlr_dev, &temp);

	if (unlikely(!fcf_dev)) {

		rc = -ENOMEM;

		goto out;

	}

	temp->fabric_name = new->fabric_name;

	temp->switch_name = new->switch_name;

	temp->fc_map = new->fc_map;

	temp->vfid = new->vfid;

	memcpy(temp->mac, new->fcf_mac, ETH_ALEN);

	temp->priority = new->pri;

	temp->fka_period = new->fka_period;

	temp->selected = 0; /* default to unselected */



	fcf_dev = fcoe_fcf_device_add(ctlr_dev, temp);

	if (unlikely(!fcf_dev))

		goto unlock;



	/*

	 * The fcoe_sysfs layer can return a CONNECTED fcf that
@@ -204,9 +206,13 @@ static int fcoe_sysfs_fcf_add(struct fcoe_fcf *new) 


	list_add(&new->list, &fip->fcfs);

	fip->fcf_count++;

	rc = 0;



out:

unlock:

	mutex_unlock(&ctlr_dev->lock);



out:

	kfree(temp);

	return rc;

}