dlm: remove signal blocking
The signal blocking was incorrect and unnecessary so just remove it. Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
parent
ededf305a8
commit
c6ca7bc91d
1 changed files with 6 additions and 19 deletions
|
@ -493,7 +493,6 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
{
|
||||
struct dlm_user_proc *proc = file->private_data;
|
||||
struct dlm_write_request *kbuf;
|
||||
sigset_t tmpsig, allsigs;
|
||||
int error;
|
||||
|
||||
#ifdef CONFIG_COMPAT
|
||||
|
@ -557,9 +556,6 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
goto out_free;
|
||||
}
|
||||
|
||||
sigfillset(&allsigs);
|
||||
sigprocmask(SIG_BLOCK, &allsigs, &tmpsig);
|
||||
|
||||
error = -EINVAL;
|
||||
|
||||
switch (kbuf->cmd)
|
||||
|
@ -567,7 +563,7 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
case DLM_USER_LOCK:
|
||||
if (!proc) {
|
||||
log_print("no locking on control device");
|
||||
goto out_sig;
|
||||
goto out_free;
|
||||
}
|
||||
error = device_user_lock(proc, &kbuf->i.lock);
|
||||
break;
|
||||
|
@ -575,7 +571,7 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
case DLM_USER_UNLOCK:
|
||||
if (!proc) {
|
||||
log_print("no locking on control device");
|
||||
goto out_sig;
|
||||
goto out_free;
|
||||
}
|
||||
error = device_user_unlock(proc, &kbuf->i.lock);
|
||||
break;
|
||||
|
@ -583,7 +579,7 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
case DLM_USER_DEADLOCK:
|
||||
if (!proc) {
|
||||
log_print("no locking on control device");
|
||||
goto out_sig;
|
||||
goto out_free;
|
||||
}
|
||||
error = device_user_deadlock(proc, &kbuf->i.lock);
|
||||
break;
|
||||
|
@ -591,7 +587,7 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
case DLM_USER_CREATE_LOCKSPACE:
|
||||
if (proc) {
|
||||
log_print("create/remove only on control device");
|
||||
goto out_sig;
|
||||
goto out_free;
|
||||
}
|
||||
error = device_create_lockspace(&kbuf->i.lspace);
|
||||
break;
|
||||
|
@ -599,7 +595,7 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
case DLM_USER_REMOVE_LOCKSPACE:
|
||||
if (proc) {
|
||||
log_print("create/remove only on control device");
|
||||
goto out_sig;
|
||||
goto out_free;
|
||||
}
|
||||
error = device_remove_lockspace(&kbuf->i.lspace);
|
||||
break;
|
||||
|
@ -607,7 +603,7 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
case DLM_USER_PURGE:
|
||||
if (!proc) {
|
||||
log_print("no locking on control device");
|
||||
goto out_sig;
|
||||
goto out_free;
|
||||
}
|
||||
error = device_user_purge(proc, &kbuf->i.purge);
|
||||
break;
|
||||
|
@ -617,8 +613,6 @@ static ssize_t device_write(struct file *file, const char __user *buf,
|
|||
kbuf->cmd);
|
||||
}
|
||||
|
||||
out_sig:
|
||||
sigprocmask(SIG_SETMASK, &tmpsig, NULL);
|
||||
out_free:
|
||||
kfree(kbuf);
|
||||
return error;
|
||||
|
@ -659,15 +653,11 @@ static int device_close(struct inode *inode, struct file *file)
|
|||
{
|
||||
struct dlm_user_proc *proc = file->private_data;
|
||||
struct dlm_ls *ls;
|
||||
sigset_t tmpsig, allsigs;
|
||||
|
||||
ls = dlm_find_lockspace_local(proc->lockspace);
|
||||
if (!ls)
|
||||
return -ENOENT;
|
||||
|
||||
sigfillset(&allsigs);
|
||||
sigprocmask(SIG_BLOCK, &allsigs, &tmpsig);
|
||||
|
||||
set_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags);
|
||||
|
||||
dlm_clear_proc_locks(ls, proc);
|
||||
|
@ -685,9 +675,6 @@ static int device_close(struct inode *inode, struct file *file)
|
|||
/* FIXME: AUTOFREE: if this ls is no longer used do
|
||||
device_remove_lockspace() */
|
||||
|
||||
sigprocmask(SIG_SETMASK, &tmpsig, NULL);
|
||||
recalc_sigpending();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue