]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
dlm: Remove another superfluous call to recalc_sigpending()
authorMatt Fleming <matt.fleming@intel.com>
Fri, 19 Aug 2011 16:46:58 +0000 (17:46 +0100)
committerOleg Nesterov <oleg@redhat.com>
Fri, 26 Aug 2011 17:15:49 +0000 (19:15 +0200)
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>
fs/dlm/user.c

index d8ea607564034a87bbc5e9614f5fdff6db347d4b..b38b122c2f522257fa351e58994f19a4d7c57427 100644 (file)
@@ -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;
 }