---

yaml --- r: 224117 b: refs/heads/master c: 973a34a h: refs/heads/master i: 224115: 9a8bb64 v: v3
git-mirror · Nov 8, 2010 · 8e021cf · 8e021cf
1 parent b02aa60
commit 8e021cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5456f09aaf88731e16dbcea7522cb330b6846415
+refs/heads/master: 973a34aa8593dbfe84386343c694f5beecb51d8a
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
@@ -2091,6 +2091,10 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
 			return mask;
 	}
 
+	/* No write status requested, avoid expensive OUT tests. */
+	if (wait && !(wait->key & (POLLWRBAND | POLLWRNORM | POLLOUT)))
+		return mask;
+
 	writable = unix_writable(sk);
 	other = unix_peer_get(sk);
 	if (other) {