From: Jeff Moyer <jmoyer@redhat.com>
Date: Thu, 23 Jun 2005 05:04:55 +0000 (-0700)
Subject: [NETPOLL]: Set poll_owner to -1 before unlocking in netpoll_poll_unlock()
X-Git-Tag: v2.6.13-rc1~68^2~534^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca4f65e6b390d09e1de7280cf9fd4f5d8e4b48b;p=linux-2.6

[NETPOLL]: Set poll_owner to -1 before unlocking in netpoll_poll_unlock()

This trivial patch moves the assignment of poll_owner to -1 inside of
the lock.  This fixes a potential SMP race in the code.

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index c0d8b90c52..449a4fde65 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -53,8 +53,8 @@ static inline void netpoll_poll_lock(struct net_device *dev)
 static inline void netpoll_poll_unlock(struct net_device *dev)
 {
 	if (dev->np) {
-		spin_unlock(&dev->np->poll_lock);
 		dev->np->poll_owner = -1;
+		spin_unlock(&dev->np->poll_lock);
 	}
 }