Skip to contentSkip to conversation

Make unix_tot_inflight counter non-atomic

PATCH Applied Pavel Emelyanov 2 participants 2 messages Nov 7, 2007 – Nov 11, 2007

Subsystems (3)
Networking Network drivers Networking unix sockets
lore
Share & tools
lore

Pavel Emelyanov

author
#0 lore raw

PATCH 1/3 Make unix_tot_inflight counter non-atomic

This counter is _always_ modified under the unix_gc_lock spinlock, so its atomicity can be provided w/o additional efforts.

Signed-off-by Pavel Emelyanov <[email protected]>

---

include/net/af_unix.h +1 -1
index 0864a77..a1c805d 100644
@@ -12,7 +12,7 @@ extern void unix_gc(void);
 
 #define UNIX_HASH_SIZE	256
 
-extern atomic_t unix_tot_inflight;
+extern unsigned int unix_tot_inflight;
 
 struct unix_address {
 	atomic_t	refcnt;
net/unix/af_unix.c +1 -1
index 515e7a6..ab9048a 100644
@@ -457,7 +457,7 @@ static int unix_release_sock (struct sock *sk, int embrion)
 	 *	  What the above comment does talk about? --ANK(980817)
 	 */
 
-	if (atomic_read(&unix_tot_inflight))
+	if (unix_tot_inflight)
 		unix_gc();		/* Garbage collect fds */
 
 	return 0;
net/unix/garbage.c +3 -3
index 406b643..399717e 100644
@@ -92,7 +92,7 @@ static LIST_HEAD(gc_inflight_list);
 static LIST_HEAD(gc_candidates);
 static DEFINE_SPINLOCK(unix_gc_lock);
 
-atomic_t unix_tot_inflight = ATOMIC_INIT(0);
+unsigned int unix_tot_inflight;
 
 
 static struct sock *unix_get_socket(struct file *filp)

@@ -133,7 +133,7 @@ void unix_inflight(struct file *fp)
 		} else {
 			BUG_ON(list_empty(&u->link));
 		}
-		atomic_inc(&unix_tot_inflight);
+		unix_tot_inflight++;
 		spin_unlock(&unix_gc_lock);
 	}
 }

@@ -147,7 +147,7 @@ void unix_notinflight(struct file *fp)
 		BUG_ON(list_empty(&u->link));
 		if (atomic_dec_and_test(&u->inflight))
 			list_del_init(&u->link);
-		atomic_dec(&unix_tot_inflight);
+		unix_tot_inflight--;
 		spin_unlock(&unix_gc_lock);
 	}
 }
Signature · 1 line
1.5.3.4