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

Commit 38b34aca authored by Yi Zou's avatar Yi Zou Committed by James Bottomley
Browse files

[SCSI] fcoe: remove unnecessary module state check 



The check of module state being MODULE_STATE_LIVE is no longer needed for the
individual fcoe transport driver, e.g., fcoe.ko, as sysfs entries now go to
libfcoe now, if it reaches fcoe.ko, it has to be already registered. The module
state check for libfcoe will guard the possible race condition of sysfs being
writable before module_init function is called and after module_exit.

Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent ee5df628

drivers/scsi/fcoe/fcoe.c

+0 −47
Original line number Diff line number Diff line
@@ -1783,17 +1783,6 @@ static int fcoe_disable(struct net_device *netdev) 
	int rc = 0;



	mutex_lock(&fcoe_config_mutex);

#ifdef CONFIG_FCOE_MODULE

	/*

	 * Make sure the module has been initialized, and is not about to be

	 * removed.  Module paramter sysfs files are writable before the

	 * module_init function is called and after module_exit.

	 */

	if (THIS_MODULE->state != MODULE_STATE_LIVE) {

		rc = -ENODEV;

		goto out_nodev;

	}

#endif



	rtnl_lock();

	fcoe = fcoe_hostlist_lookup_port(netdev);
@@ -1805,7 +1794,6 @@ static int fcoe_disable(struct net_device *netdev) 
	} else

		rc = -ENODEV;



out_nodev:

	mutex_unlock(&fcoe_config_mutex);

	return rc;

}
@@ -1824,17 +1812,6 @@ static int fcoe_enable(struct net_device *netdev) 
	int rc = 0;



	mutex_lock(&fcoe_config_mutex);

#ifdef CONFIG_FCOE_MODULE

	/*

	 * Make sure the module has been initialized, and is not about to be

	 * removed.  Module paramter sysfs files are writable before the

	 * module_init function is called and after module_exit.

	 */

	if (THIS_MODULE->state != MODULE_STATE_LIVE) {

		rc = -ENODEV;

		goto out_nodev;

	}

#endif

	rtnl_lock();

	fcoe = fcoe_hostlist_lookup_port(netdev);

	rtnl_unlock();
@@ -1844,7 +1821,6 @@ static int fcoe_enable(struct net_device *netdev) 
	else if (!fcoe_link_ok(fcoe->ctlr.lp))

		fcoe_ctlr_link_up(&fcoe->ctlr);



out_nodev:

	mutex_unlock(&fcoe_config_mutex);

	return rc;

}
@@ -1863,17 +1839,6 @@ static int fcoe_destroy(struct net_device *netdev) 
	int rc = 0;



	mutex_lock(&fcoe_config_mutex);

#ifdef CONFIG_FCOE_MODULE

	/*

	 * Make sure the module has been initialized, and is not about to be

	 * removed.  Module paramter sysfs files are writable before the

	 * module_init function is called and after module_exit.

	 */

	if (THIS_MODULE->state != MODULE_STATE_LIVE) {

		rc = -ENODEV;

		goto out_nodev;

	}

#endif

	rtnl_lock();

	fcoe = fcoe_hostlist_lookup_port(netdev);

	if (!fcoe) {
@@ -1938,18 +1903,6 @@ static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode) 
	mutex_lock(&fcoe_config_mutex);

	rtnl_lock();



#ifdef CONFIG_FCOE_MODULE

	/*

	 * Make sure the module has been initialized, and is not about to be

	 * removed.  Module paramter sysfs files are writable before the

	 * module_init function is called and after module_exit.

	 */

	if (THIS_MODULE->state != MODULE_STATE_LIVE) {

		rc = -ENODEV;

		goto out_nodev;

	}

#endif



	/* look for existing lport */

	if (fcoe_hostlist_lookup(netdev)) {

		rc = -EEXIST;