From 7720feaa8db15407bfe2fe8e272eb2676868b975 Mon Sep 17 00:00:00 2001 From: Marc Eshel Date: Tue, 28 Nov 2006 16:27:06 -0500 Subject: [PATCH] --- yaml --- r: 54495 b: refs/heads/master c: 85f3f1b3f7a6197b51a2ab98d927517df730214c h: refs/heads/master i: 54493: fcc042ba4310ef8372633f2ebce5e265dec54447 54491: 94e58f4ea3a59fc555882a5357811c895113e269 54487: 37870a2d44e12e4d0332cb0dea57c972daad5b1b 54479: 245c41aad5d2294ddd1f3a9336e636cc30943c2b 54463: 4147868030cddd8804a54ec531f6d49d13087c49 v: v3 --- [refs] | 2 +- trunk/fs/lockd/svc4proc.c | 2 +- trunk/fs/lockd/svclock.c | 5 +++-- trunk/fs/lockd/svcproc.c | 2 +- trunk/include/linux/lockd/lockd.h | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b5e5c4787dd8..0b115cb46b7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e4ac9d93515b27fd7635332d73eae3192ed5d4e +refs/heads/master: 85f3f1b3f7a6197b51a2ab98d927517df730214c diff --git a/trunk/fs/lockd/svc4proc.c b/trunk/fs/lockd/svc4proc.c index 47a66aa5d55b..a1bccad7ebd3 100644 --- a/trunk/fs/lockd/svc4proc.c +++ b/trunk/fs/lockd/svc4proc.c @@ -99,7 +99,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success; /* Now check for conflicting locks */ - resp->status = nlmsvc_testlock(file, &argp->lock, &resp->lock); + resp->status = nlmsvc_testlock(rqstp, file, &argp->lock, &resp->lock, &resp->cookie); dprintk("lockd: TEST4 status %d\n", ntohl(resp->status)); nlm_release_host(host); diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c index 6e748573e0c6..7ab2e60c51f7 100644 --- a/trunk/fs/lockd/svclock.c +++ b/trunk/fs/lockd/svclock.c @@ -442,8 +442,9 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, * Test for presence of a conflicting lock. */ __be32 -nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, - struct nlm_lock *conflock) +nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, + struct nlm_lock *lock, struct nlm_lock *conflock, + struct nlm_cookie *cookie) { dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n", file->f_file->f_path.dentry->d_inode->i_sb->s_id, diff --git a/trunk/fs/lockd/svcproc.c b/trunk/fs/lockd/svcproc.c index 31cb48425733..d13b827dfd34 100644 --- a/trunk/fs/lockd/svcproc.c +++ b/trunk/fs/lockd/svcproc.c @@ -127,7 +127,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success; /* Now check for conflicting locks */ - resp->status = cast_status(nlmsvc_testlock(file, &argp->lock, &resp->lock)); + resp->status = cast_status(nlmsvc_testlock(rqstp, file, &argp->lock, &resp->lock, &resp->cookie)); dprintk("lockd: TEST status %d vers %d\n", ntohl(resp->status), rqstp->rq_vers); diff --git a/trunk/include/linux/lockd/lockd.h b/trunk/include/linux/lockd/lockd.h index d4c4de753bca..424c3de333d3 100644 --- a/trunk/include/linux/lockd/lockd.h +++ b/trunk/include/linux/lockd/lockd.h @@ -195,8 +195,8 @@ typedef int (*nlm_host_match_fn_t)(struct nlm_host *cur, struct nlm_host *ref) __be32 nlmsvc_lock(struct svc_rqst *, struct nlm_file *, struct nlm_lock *, int, struct nlm_cookie *); __be32 nlmsvc_unlock(struct nlm_file *, struct nlm_lock *); -__be32 nlmsvc_testlock(struct nlm_file *, struct nlm_lock *, - struct nlm_lock *); +__be32 nlmsvc_testlock(struct svc_rqst *, struct nlm_file *, + struct nlm_lock *, struct nlm_lock *, struct nlm_cookie *); __be32 nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *); unsigned long nlmsvc_retry_blocked(void); void nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,