1 files changed, 6 insertions, 5 deletions

diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
index fba1f1d87e4f..1f7b038530b4 100644
--- a/fs/gfs2/locking/dlm/plock.c
+++ b/fs/gfs2/locking/dlm/plock.c
@@ -346,15 +346,16 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count,
 
 static unsigned int dev_poll(struct file *file, poll_table *wait)
 {
+        unsigned int mask = 0;
+
         poll_wait(file, &send_wq, wait);
 
         spin_lock(&ops_lock);
-        if (!list_empty(&send_list)) {
-                spin_unlock(&ops_lock);
-                return POLLIN | POLLRDNORM;
-        }
+        if (!list_empty(&send_list))
+                mask = POLLIN | POLLRDNORM;
         spin_unlock(&ops_lock);
-        return 0;
+
+        return mask;
 }
 
 static const struct file_operations dev_fops = {