net/smc: no urgent data check for listen sockets

karstengr · davem330 · commit 71d117f52742 · 2018-09-18T20:11:43.000-07:00
Don't check a listen socket for pending urgent data in smc_poll().

Signed-off-by: Karsten Graul &lt;kgraul@linux.ibm.com&gt;
Signed-off-by: Ursula Braun &lt;ubraun@linux.ibm.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
@@ -1566,9 +1566,9 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
 				mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
 			if (sk->sk_state == SMC_APPCLOSEWAIT1)
 				mask |= EPOLLIN;
+			if (smc->conn.urg_state == SMC_URG_VALID)
+				mask |= EPOLLPRI;
 		}
-		if (smc->conn.urg_state == SMC_URG_VALID)
-			mask |= EPOLLPRI;
 	}
 
 	return mask;

Original file line number	Diff line number	Diff line change
`@@ -1566,9 +1566,9 @@ static __poll_t smc_poll(struct file file, struct socket sock,`
`1566`	`1566`	`mask \|= EPOLLIN \| EPOLLRDNORM \| EPOLLRDHUP;`
`1567`	`1567`	`if (sk->sk_state == SMC_APPCLOSEWAIT1)`
`1568`	`1568`	`mask \|= EPOLLIN;`
	`1569`	`+ if (smc->conn.urg_state == SMC_URG_VALID)`
	`1570`	`+ mask \|= EPOLLPRI;`
`1569`	`1571`	`}`
`1570`		`- if (smc->conn.urg_state == SMC_URG_VALID)`
`1571`		`- mask \|= EPOLLPRI;`
`1572`	`1572`	`}`
`1573`	`1573`
`1574`	`1574`	`return mask;`