Skip to content

Commit

Permalink
decnet: convert dndev_lock to spinlock
Browse files Browse the repository at this point in the history
There is no reason for this lock to be reader/writer since
the reader only has lock held for a very brief period.
The overhead of read_lock is more expensive than spinlock.

Compile tested only, I am not a decnet user.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
stephen hemminger authored and David S. Miller committed Nov 12, 2009
1 parent 41bdecf commit e5c140a
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions net/decnet/dn_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ extern struct neigh_table dn_neigh_table;
*/
__le16 decnet_address = 0;

static DEFINE_RWLOCK(dndev_lock);
static DEFINE_SPINLOCK(dndev_lock);
static struct net_device *decnet_default_device;
static BLOCKING_NOTIFIER_HEAD(dnaddr_chain);

Expand Down Expand Up @@ -557,15 +557,17 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
struct net_device *dn_dev_get_default(void)
{
struct net_device *dev;
read_lock(&dndev_lock);

spin_lock(&dndev_lock);
dev = decnet_default_device;
if (dev) {
if (dev->dn_ptr)
dev_hold(dev);
else
dev = NULL;
}
read_unlock(&dndev_lock);
spin_unlock(&dndev_lock);

return dev;
}

Expand All @@ -575,27 +577,30 @@ int dn_dev_set_default(struct net_device *dev, int force)
int rv = -EBUSY;
if (!dev->dn_ptr)
return -ENODEV;
write_lock(&dndev_lock);

spin_lock(&dndev_lock);
if (force || decnet_default_device == NULL) {
old = decnet_default_device;
decnet_default_device = dev;
rv = 0;
}
write_unlock(&dndev_lock);
spin_unlock(&dndev_lock);

if (old)
dev_put(old);
return rv;
}

static void dn_dev_check_default(struct net_device *dev)
{
write_lock(&dndev_lock);
spin_lock(&dndev_lock);
if (dev == decnet_default_device) {
decnet_default_device = NULL;
} else {
dev = NULL;
}
write_unlock(&dndev_lock);
spin_unlock(&dndev_lock);

if (dev)
dev_put(dev);
}
Expand Down

0 comments on commit e5c140a

Please sign in to comment.