diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-14 18:37:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-14 18:37:24 -0700 |
| commit | 8aa651e23e2835b6d64381ce17447c995040ab30 (patch) | |
| tree | 68c6a283b26b89cb2591f3be2f927234243a5d7d /fs/dlm/lock.c | |
| parent | d878fe2331219ff8518192b67f66699cb6d164e2 (diff) | |
| parent | a89d63a159b1ba5833be2bef00adf8ad8caac8be (diff) | |
| download | kernel_samsung_tuna-8aa651e23e2835b6d64381ce17447c995040ab30.zip kernel_samsung_tuna-8aa651e23e2835b6d64381ce17447c995040ab30.tar.gz kernel_samsung_tuna-8aa651e23e2835b6d64381ce17447c995040ab30.tar.bz2 | |
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: free socket in error exit path
dlm: fix plock use-after-free
dlm: Fix uninitialised variable warning in lock.c
Diffstat (limited to 'fs/dlm/lock.c')
| -rw-r--r-- | fs/dlm/lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 205ec95..eb507c4 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -435,7 +435,7 @@ static int search_rsb(struct dlm_ls *ls, char *name, int len, int b, static int find_rsb(struct dlm_ls *ls, char *name, int namelen, unsigned int flags, struct dlm_rsb **r_ret) { - struct dlm_rsb *r, *tmp; + struct dlm_rsb *r = NULL, *tmp; uint32_t hash, bucket; int error = -EINVAL; |