git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
linux
/
nfsd
/
nfsd.h
diff --git
a/include/linux/nfsd/nfsd.h
b/include/linux/nfsd/nfsd.h
index
e181852
..
5757370
100644
(file)
--- a/
include/linux/nfsd/nfsd.h
+++ b/
include/linux/nfsd/nfsd.h
@@
-92,9
+92,9
@@
int nfsd_open(struct svc_rqst *, struct svc_fh *, int,
int, struct file *);
void nfsd_close(struct file *);
int nfsd_read(struct svc_rqst *, struct svc_fh *,
int, struct file *);
void nfsd_close(struct file *);
int nfsd_read(struct svc_rqst *, struct svc_fh *,
- loff_t, struct
io
vec *,int, unsigned long *);
+ loff_t, struct
k
vec *,int, unsigned long *);
int nfsd_write(struct svc_rqst *, struct svc_fh *,
int nfsd_write(struct svc_rqst *, struct svc_fh *,
- loff_t, struct
io
vec *,int, unsigned long, int *);
+ loff_t, struct
k
vec *,int, unsigned long, int *);
int nfsd_readlink(struct svc_rqst *, struct svc_fh *,
char *, int *);
int nfsd_symlink(struct svc_rqst *, struct svc_fh *,
int nfsd_readlink(struct svc_rqst *, struct svc_fh *,
char *, int *);
int nfsd_symlink(struct svc_rqst *, struct svc_fh *,
@@
-126,9
+126,13
@@
int nfsd_permission(struct svc_export *, struct dentry *, int);
#ifdef CONFIG_NFSD_V4
void nfs4_state_init(void);
void nfs4_state_shutdown(void);
#ifdef CONFIG_NFSD_V4
void nfs4_state_init(void);
void nfs4_state_shutdown(void);
+time_t nfs4_lease_time(void);
+void nfs4_reset_lease(time_t leasetime);
#else
void static inline nfs4_state_init(void){}
void static inline nfs4_state_shutdown(void){}
#else
void static inline nfs4_state_init(void){}
void static inline nfs4_state_shutdown(void){}
+time_t static inline nfs4_lease_time(void){return 0;}
+void static inline nfs4_reset_lease(time_t leasetime){}
#endif
/*
#endif
/*
@@
-249,7
+253,7
@@
static inline int is_fsid(struct svc_fh *fh, struct knfsd_fh *reffh)
#define COMPOUND_SLACK_SPACE 140 /* OP_GETFH */
#define COMPOUND_ERR_SLACK_SPACE 12 /* OP_SETATTR */
#define COMPOUND_SLACK_SPACE 140 /* OP_GETFH */
#define COMPOUND_ERR_SLACK_SPACE 12 /* OP_SETATTR */
-#define NFSD_LEASE_TIME
60 /* seconds */
+#define NFSD_LEASE_TIME
(nfs4_lease_time())
#define NFSD_LAUNDROMAT_MINTIMEOUT 10 /* seconds */
/*
#define NFSD_LAUNDROMAT_MINTIMEOUT 10 /* seconds */
/*