summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-03-24 14:56:47 +0100
committerDavid Teigland <teigland@redhat.com>2011-03-28 17:20:17 +0200
commit4bcad6c1ef53a9a0224f4654ceb3b9030d0769ec (patch)
treeebb381a3166818f01fe1f0b170564b7576350705 /fs
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg... (diff)
downloadlinux-4bcad6c1ef53a9a0224f4654ceb3b9030d0769ec.tar.xz
linux-4bcad6c1ef53a9a0224f4654ceb3b9030d0769ec.zip
dlm: Remove superfluous call to recalc_sigpending()
recalc_sigpending() is called within sigprocmask(), so there is no need call it again after sigprocmask() has returned. Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/dlm/user.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index d5ab3fe7c198..e96bf3e9be88 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -611,7 +611,6 @@ static ssize_t device_write(struct file *file, const char __user *buf,
out_sig:
sigprocmask(SIG_SETMASK, &tmpsig, NULL);
- recalc_sigpending();
out_free:
kfree(kbuf);
return error;