Update of /cvsroot/linux-vax/kernel-2.4/include/linux/lockd
In directory usw-pr-cvs1:/tmp/cvs-serv17906/linux/lockd
Modified Files:
lockd.h nlm.h xdr.h
Log Message:
sync 2.4.15 commit 3
Index: lockd.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/lockd/lockd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- lockd.h 14 Jan 2001 16:48:26 -0000 1.1.1.1
+++ lockd.h 9 Apr 2002 12:44:17 -0000 1.2
@@ -47,6 +47,7 @@
unsigned short h_authflavor; /* RPC authentication type */
unsigned short h_reclaiming : 1,
h_inuse : 1,
+ h_killed : 1,
h_monitored : 1;
wait_queue_head_t h_gracewait; /* wait while reclaiming */
u32 h_state; /* pseudo-state counter */
@@ -120,7 +121,7 @@
#ifdef CONFIG_LOCKD_V4
extern struct svc_procedure nlmsvc_procedures4[];
#endif
-extern unsigned long nlmsvc_grace_period;
+extern int nlmsvc_grace_period;
extern unsigned long nlmsvc_timeout;
/*
@@ -173,7 +174,7 @@
void nlmsvc_mark_resources(void);
void nlmsvc_free_host_resources(struct nlm_host *);
-extern __inline__ struct inode *
+static __inline__ struct inode *
nlmsvc_file_inode(struct nlm_file *file)
{
return file->f_file.f_dentry->d_inode;
@@ -182,7 +183,7 @@
/*
* Compare two host addresses (needs modifying for ipv6)
*/
-extern __inline__ int
+static __inline__ int
nlm_cmp_addr(struct sockaddr_in *sin1, struct sockaddr_in *sin2)
{
return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
@@ -192,7 +193,7 @@
* Compare two NLM locks.
* When the second lock is of type F_UNLCK, this acts like a wildcard.
*/
-extern __inline__ int
+static __inline__ int
nlm_compare_locks(struct file_lock *fl1, struct file_lock *fl2)
{
return fl1->fl_pid == fl2->fl_pid
Index: nlm.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/lockd/nlm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nlm.h 14 Jan 2001 16:48:26 -0000 1.1.1.1
+++ nlm.h 9 Apr 2002 12:44:17 -0000 1.2
@@ -49,10 +49,10 @@
#define NLMPROC_CANCEL_RES 13
#define NLMPROC_UNLOCK_RES 14
#define NLMPROC_GRANTED_RES 15
+#define NLMPROC_NSM_NOTIFY 16 /* statd callback */
#define NLMPROC_SHARE 20
#define NLMPROC_UNSHARE 21
#define NLMPROC_NM_LOCK 22
#define NLMPROC_FREE_ALL 23
-#define NLMPROC_NSM_NOTIFY 24 /* statd callback */
#endif /* LINUX_LOCKD_NLM_H */
Index: xdr.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/lockd/xdr.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xdr.h 14 Jan 2001 16:48:27 -0000 1.1.1.1
+++ xdr.h 9 Apr 2002 12:44:17 -0000 1.2
@@ -26,6 +26,7 @@
/* Lock info passed via NLM */
struct nlm_lock {
char * caller;
+ int len; /* length of "caller" */
struct nfs_fh fh;
struct xdr_netobj oh;
struct file_lock fl;
@@ -82,7 +83,6 @@
*/
#define NLMSVC_XDRSIZE sizeof(struct nlm_args)
-void nlmxdr_init(void);
int nlmsvc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
int nlmsvc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
int nlmsvc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
|
