From: Matt Fleming <matt.fleming@intel.com>
Date: Fri, 19 Aug 2011 16:46:58 +0000 (+0100)
Subject: dlm: Remove another superfluous call to recalc_sigpending()
X-Git-Tag: next-20110829~17^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ce39791cab0748a84bf65c3a8c9eca521c69645;p=karo-tx-linux.git

dlm: Remove another superfluous call to recalc_sigpending()

recalc_sigpending() is called within sigprocmask(), so there is no
need call it again after sigprocmask() has returned. Furthermore, the
call to recalc_sigpending() could race with signal_wake_up() because
it isn't called with sighand->siglock held. I must have missed this
call when removing the other recalc_sigpending() in commit
4bcad6c1ef53 ("dlm: Remove superfluous call to recalc_sigpending())".

Cc: Christine Caulfield <ccaulfie@redhat.com>
Acked-by: David Teigland <teigland@redhat.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index d8ea60756403..b38b122c2f52 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -678,7 +678,6 @@ static int device_close(struct inode *inode, struct file *file)
 	   device_remove_lockspace() */
 
 	sigprocmask(SIG_SETMASK, &tmpsig, NULL);
-	recalc_sigpending();
 
 	return 0;
 }