diff options
| author |   Marc Eshel <eshel@almaden.ibm.com> | 2006-11-28 16:27:06 -0500 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@citi.umich.edu> | 2007-05-06 20:38:50 -0400 |
| commit | 1a8322b2b02071b0c7ac37a28357b93e6362f13e (patch) | |
| tree | 04fbdd52d8b3c2886d70b3739b9dff683aa79f02 /fs/lockd/svcproc.c | |
| parent | lockd: always preallocate block in nlmsvc_lock() (diff) | |
| download | linux-dev-1a8322b2b02071b0c7ac37a28357b93e6362f13e.tar.xz linux-dev-1a8322b2b02071b0c7ac37a28357b93e6362f13e.zip | |
lockd: add code to handle deferred lock requests
Rewrite nlmsvc_lock() to use the asynchronous interface.
As with testlock, we answer nlm requests in nlmsvc_lock by first looking up
the block and then using the results we find in the block if B_QUEUED is
set, and calling vfs_lock_file() otherwise.
If this a new lock request and we get -EINPROGRESS return on a non-blocking
request then we defer the request.
Also modify nlmsvc_unlock() to call the filesystem method if appropriate.
Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/lockd/svcproc.c')
| -rw-r--r-- | fs/lockd/svcproc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 40b5cf496b51..9cd5c8b37593 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -175,6 +175,8 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, /* Now try to lock the file */ resp->status = cast_status(nlmsvc_lock(rqstp, file, &argp->lock, argp->block, &argp->cookie)); + if (resp->status == nlm_drop_reply) + return rpc_drop_reply; dprintk("lockd: LOCK status %d\n", ntohl(resp->status)); nlm_release_host(host); |