From 4e4ed3d9663d230c130923e09216e26155a42ff3 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 15 Jul 2008 15:05:45 -0400 Subject: [PATCH] --- yaml --- r: 104129 b: refs/heads/master c: 560de0e65904db392e1c443c4bf5ee750573336b h: refs/heads/master i: 104127: aa3c63af1b2cda3b6004cf635381b1ada6ca2a9d v: v3 --- [refs] | 2 +- trunk/fs/lockd/svclock.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f31581358c15..34f69de83e14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d7bbbbacc5202eaabbc232681cc325b22a73eeb +refs/heads/master: 560de0e65904db392e1c443c4bf5ee750573336b diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c index 51a0dea0ae8a..b8f86b73a85d 100644 --- a/trunk/fs/lockd/svclock.c +++ b/trunk/fs/lockd/svclock.c @@ -180,6 +180,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_host *host, struct nlm_block *block; struct nlm_rqst *call = NULL; + nlm_get_host(host); call = nlm_alloc_call(host); if (call == NULL) return NULL; @@ -380,8 +381,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, */ block = nlmsvc_lookup_block(file, lock); if (block == NULL) { - block = nlmsvc_create_block(rqstp, nlm_get_host(host), file, - lock, cookie); + block = nlmsvc_create_block(rqstp, host, file, lock, cookie); ret = nlm_lck_denied_nolocks; if (block == NULL) goto out; @@ -476,7 +476,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, if (conf == NULL) return nlm_granted; - nlm_get_host(host); block = nlmsvc_create_block(rqstp, host, file, lock, cookie); if (block == NULL) { kfree(conf);