---

yaml --- r: 23859 b: refs/heads/master c: 36943fa h: refs/heads/master i: 23857: 2ef4ae7 23855: 7981f51 v: v3
git-mirror · Mar 20, 2006 · 690343b · 690343b
1 parent 687c267
commit 690343b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47831f35b83e43c804215712dd0c834c92e8a441
+refs/heads/master: 36943fa4b2701b9ef2d60084c85ecbe634aec252
diff --git a/trunk/fs/lockd/clntproc.c b/trunk/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);
 	}