diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 19:44:05 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 19:44:05 +0100 |
| commit | 36943fa4b2701b9ef2d60084c85ecbe634aec252 (patch) | |
| tree | a234dbfff1f7d46a8202e0666ac7666d39b420ae /fs/lockd/clntproc.c | |
| parent | VFS: Fix __posix_lock_file() copy of private lock area (diff) | |
| download | linux-36943fa4b2701b9ef2d60084c85ecbe634aec252.tar.xz linux-36943fa4b2701b9ef2d60084c85ecbe634aec252.zip | |
NLM: nlm_alloc_call should not immediately fail on signal
Currently, nlm_alloc_call tests for a signal before it even tries to
allocate memory.
Fix it so that it tries at least once.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd/clntproc.c')
| -rw-r--r-- | fs/lockd/clntproc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 970b6a6aa337..615a988a92a7 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c @@ -291,14 +291,15 @@ nlmclnt_alloc_call(void) { struct nlm_rqst *call; - while (!signalled()) { - call = (struct nlm_rqst *) kmalloc(sizeof(struct nlm_rqst), GFP_KERNEL); - if (call) { - memset(call, 0, sizeof(*call)); + for(;;) { + call = kzalloc(sizeof(*call), GFP_KERNEL); + if (call != NULL) { locks_init_lock(&call->a_args.lock.fl); locks_init_lock(&call->a_res.lock.fl); return call; } + if (signalled()) + break; printk("nlmclnt_alloc_call: failed, waiting for memory\n"); schedule_timeout_interruptible(5*HZ); } |