diff options
author | Marc Eshel <eshel@almaden.ibm.com> | 2006-11-28 16:26:47 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-05-06 20:38:50 -0400 |
commit | 2b36f412ab6f2e5b64af9832b20eb7ef67d025b4 (patch) | |
tree | b4a561cc944d25d96798f97d06bd78760db7afba /fs/lockd | |
parent | 2beb6614f5e36c6165b704c167d82ef3e4ceaa0c (diff) | |
download | kernel_samsung_aries-2b36f412ab6f2e5b64af9832b20eb7ef67d025b4.zip kernel_samsung_aries-2b36f412ab6f2e5b64af9832b20eb7ef67d025b4.tar.gz kernel_samsung_aries-2b36f412ab6f2e5b64af9832b20eb7ef67d025b4.tar.bz2 |
lockd: save lock state on deferral
We need to keep some state for a pending asynchronous lock request, so this
patch adds that state to struct nlm_block.
This also adds a function which defers the request, by calling
rqstp->rq_chandle.defer and storing the resulting deferred request in a
nlm_block structure which we insert into lockd's global block list. That
new function isn't called yet, so it's dead code until a later patch.
Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/lockd')
-rw-r--r-- | fs/lockd/svclock.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 3b0e7a4..f244926 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -331,6 +331,31 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call) } /* + * Deferred lock request handling for non-blocking lock + */ +static u32 +nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block) +{ + u32 status = nlm_lck_denied_nolocks; + + block->b_flags |= B_QUEUED; + + nlmsvc_insert_block(block, NLM_TIMEOUT); + + block->b_cache_req = &rqstp->rq_chandle; + if (rqstp->rq_chandle.defer) { + block->b_deferred_req = + rqstp->rq_chandle.defer(block->b_cache_req); + if (block->b_deferred_req != NULL) + status = nlm_drop_reply; + } + dprintk("lockd: nlmsvc_defer_lock_rqst block %p flags %d status %d\n", + block, block->b_flags, status); + + return status; +} + +/* * Attempt to establish a lock, and if it can't be granted, block it * if required. */ |