From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 19 Jan 2016 17:03:05 +0000 (-0500)
Subject: orangefs: ->poll() is only called between successful ->open() and ->release()
X-Git-Tag: v4.6-rc1~2^2~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83595db05214eb49477b2ffb7d18ce4e7468c776;p=thirdparty%2Fkernel%2Flinux.git

orangefs: ->poll() is only called between successful ->open() and ->release()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
---

diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index fb7f092f94ba6..4cecc7c4f7600 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -966,14 +966,12 @@ static unsigned int orangefs_devreq_poll(struct file *file,
 {
 	int poll_revent_mask = 0;
 
-	if (open_access_count == 1) {
-		poll_wait(file, &orangefs_request_list_waitq, poll_table);
+	poll_wait(file, &orangefs_request_list_waitq, poll_table);
 
-		spin_lock(&orangefs_request_list_lock);
-		if (!list_empty(&orangefs_request_list))
-			poll_revent_mask |= POLL_IN;
-		spin_unlock(&orangefs_request_list_lock);
-	}
+	spin_lock(&orangefs_request_list_lock);
+	if (!list_empty(&orangefs_request_list))
+		poll_revent_mask |= POLL_IN;
+	spin_unlock(&orangefs_request_list_lock);
 	return poll_revent_mask;
 }