[PATCH 09/51] [GFS2] use an temp variable to reduce a spin_unlock

From: Denis Cheng <[email protected]>

this is more clear.

Signed-off-by: Denis Cheng <[email protected]>
Signed-off-by: David Teigland <[email protected]>
Signed-off-by: Steven Whitehouse <[email protected]>

diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
index fba1f1d..1f7b038 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 = {
-- 
1.5.1.2

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 10/51] [GFS2] Detach buf data during in-place writeback
    • From: [email protected]

• References:
  • [GFS2/DLM] Pre-pull patch posting
    • From: [email protected]
  • [PATCH 01/51] [GFS2] Fix two races relating to glock callbacks
    • From: [email protected]
  • [PATCH 02/51] [GFS2] Fix calculation of demote state
    • From: [email protected]
  • [PATCH 03/51] [GFS2] Clean up duplicate includes in fs/gfs2/
    • From: [email protected]
  • [PATCH 04/51] [GFS2] GFS2 not checking pointer on create when running under nfsd
    • From: [email protected]
  • [PATCH 05/51] [GFS2] Fix an oops in glock dumping
    • From: [email protected]
  • [PATCH 06/51] [GFS2] Move some code inside the log lock
    • From: [email protected]
  • [PATCH 07/51] [GFS2] Revert part of earlier log.c changes
    • From: [email protected]
  • [PATCH 08/51] [GFS2] Prevent infinite loop in try_rgrp_unlink()
    • From: [email protected]

• Prev by Date: [PATCH 08/51] [GFS2] Prevent infinite loop in try_rgrp_unlink()
• Next by Date: [PATCH 10/51] [GFS2] Detach buf data during in-place writeback
• Previous by thread: [PATCH 08/51] [GFS2] Prevent infinite loop in try_rgrp_unlink()
• Next by thread: [PATCH 10/51] [GFS2] Detach buf data during in-place writeback
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]