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

Commit ee5df628 authored by Robert Love's avatar Robert Love Committed by James Bottomley
Browse files

[SCSI] fcoe: Remove mutex_trylock/restart_syscall checks 



These checks were initially added to avoid a lockdep
false positive when dealing with the s_active, rtnl
and fcoe_config_mutex mutexes. Recently the create,
destroy, enable and disable sysfs entries were moved
from fcoe.ko to libfcoe.ko. With this change the mutex
usage was shuffled around and the lockdep false
positive stopped happening. We can now remove these
checks.

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

drivers/scsi/fcoe/fcoe.c

+4 −20
Original line number Diff line number Diff line
@@ -1795,11 +1795,7 @@ static int fcoe_disable(struct net_device *netdev) 
	}

#endif



	if (!rtnl_trylock()) {

		mutex_unlock(&fcoe_config_mutex);

		return -ERESTARTSYS;

	}



	rtnl_lock();

	fcoe = fcoe_hostlist_lookup_port(netdev);

	rtnl_unlock();
@@ -1839,11 +1835,7 @@ static int fcoe_enable(struct net_device *netdev) 
		goto out_nodev;

	}

#endif

	if (!rtnl_trylock()) {

		mutex_unlock(&fcoe_config_mutex);

		return -ERESTARTSYS;

	}



	rtnl_lock();

	fcoe = fcoe_hostlist_lookup_port(netdev);

	rtnl_unlock();
@@ -1882,11 +1874,7 @@ static int fcoe_destroy(struct net_device *netdev) 
		goto out_nodev;

	}

#endif

	if (!rtnl_trylock()) {

		mutex_unlock(&fcoe_config_mutex);

		return -ERESTARTSYS;

	}



	rtnl_lock();

	fcoe = fcoe_hostlist_lookup_port(netdev);

	if (!fcoe) {

		rtnl_unlock();
@@ -1948,11 +1936,7 @@ static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode) 
	struct fc_lport *lport;



	mutex_lock(&fcoe_config_mutex);



	if (!rtnl_trylock()) {

		mutex_unlock(&fcoe_config_mutex);

		return -ERESTARTSYS;

	}

	rtnl_lock();



#ifdef CONFIG_FCOE_MODULE

	/*