summaryrefslogtreecommitdiffstats
path: root/include/linux/lockd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2008-02-06 13:59:23 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-10-03 16:19:19 -0400
commitb2b5028905226f85075a408b1118857c9aa48bb3 (patch)
tree79d4e32fe7b0f4f12282282f0b0147ca2b438171 /include/linux/lockd
parentaf558e33bedab672f5cfd3260bce7445e353fe21 (diff)
downloadtalos-op-linux-b2b5028905226f85075a408b1118857c9aa48bb3.tar.gz
talos-op-linux-b2b5028905226f85075a408b1118857c9aa48bb3.zip
lockd: move grace period checks to common code
Do all the grace period checks in svclock.c. This simplifies the code a bit, and will ease some later changes. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include/linux/lockd')
-rw-r--r--include/linux/lockd/lockd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index ec8af115843d..973ab1d6e862 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -242,7 +242,7 @@ typedef int (*nlm_host_match_fn_t)(void *cur, struct nlm_host *ref);
*/
__be32 nlmsvc_lock(struct svc_rqst *, struct nlm_file *,
struct nlm_host *, struct nlm_lock *, int,
- struct nlm_cookie *);
+ struct nlm_cookie *, int);
__be32 nlmsvc_unlock(struct nlm_file *, struct nlm_lock *);
__be32 nlmsvc_testlock(struct svc_rqst *, struct nlm_file *,
struct nlm_host *, struct nlm_lock *,
OpenPOWER on IntegriCloud