diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /fs/lockd/svclock.c | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'fs/lockd/svclock.c')
| -rw-r--r-- | fs/lockd/svclock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 69a9eeb21..ac650b5f3 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -158,10 +158,8 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_file *file, /* Set notifier function for VFS, and init args */ lock->fl.fl_notify = nlmsvc_notify_blocked; - if (!nlmclnt_setgrantargs(&block->b_call, lock)) { - kfree(block); - goto failed; - } + if (!nlmclnt_setgrantargs(&block->b_call, lock)) + goto failed_free; block->b_call.a_args.cookie = cookie; /* see above */ dprintk("lockd: created block %p...\n", block); @@ -182,6 +180,8 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_file *file, return block; +failed_free: + kfree(block); failed: nlm_release_host(host); return NULL; |