diff options
| author | Linus Torvalds | 2008-07-28 18:46:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-07-28 18:46:00 +0200 |
| commit | 3988ba0708e98b4bafc9034aa476775520bee708 (patch) | |
| tree | 8c706018fef444bc16b33fa8208e78cabf993a1f /fs/dlm/user.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | dlm: fix uninitialized variable for search_rsb_list callers (diff) | |
| download | kernel-qcow2-linux-3988ba0708e98b4bafc9034aa476775520bee708.tar.gz kernel-qcow2-linux-3988ba0708e98b4bafc9034aa476775520bee708.tar.xz kernel-qcow2-linux-3988ba0708e98b4bafc9034aa476775520bee708.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: fix uninitialized variable for search_rsb_list callers
dlm: release socket on error
dlm: fix basts for granted CW waiting PR/CW
dlm: check for null in device_write
Diffstat (limited to 'fs/dlm/user.c')
| -rw-r--r-- | fs/dlm/user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index f976f303c196..929e48ae7591 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -539,7 +539,7 @@ static ssize_t device_write(struct file *file, const char __user *buf, /* do we really need this? can a write happen after a close? */ if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) && - test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags)) + (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags))) return -EINVAL; sigfillset(&allsigs); |