asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] fcoe: Remove mutex_trylock/restart_syscall checks

Browse source 
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: Robert Love <robert.w.love@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Robert Love 2011-04-01 16:05:59 -07:00 committed by James Bottomley
parent b3960afe04
commit ee5df628c1
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/scsi/fcoe/fcoe.c
View file

@ -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
/*