diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
| commit | f6c43385435640e056424034caac0d765c45e370 (patch) | |
| tree | 54c2ba0a7d3abb156bc51f6b9f02e00f0a260f85 /fs/dlm/lock.c | |
| parent | 65bc98b0059360e458aebd208587be44641227c1 (diff) | |
| parent | 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 205ec95b347e..eb507c453c5f 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, | |||
| 435 | static int find_rsb(struct dlm_ls *ls, char *name, int namelen, | 435 | static int find_rsb(struct dlm_ls *ls, char *name, int namelen, |
| 436 | unsigned int flags, struct dlm_rsb **r_ret) | 436 | unsigned int flags, struct dlm_rsb **r_ret) |
| 437 | { | 437 | { |
| 438 | struct dlm_rsb *r, *tmp; | 438 | struct dlm_rsb *r = NULL, *tmp; |
| 439 | uint32_t hash, bucket; | 439 | uint32_t hash, bucket; |
| 440 | int error = -EINVAL; | 440 | int error = -EINVAL; |
| 441 | 441 | ||