patch-2.3.51 linux/include/linux/lockd/xdr.h

Next file: linux/include/linux/lockd/xdr4.h
Previous file: linux/include/linux/lockd/lockd.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.50/linux/include/linux/lockd/xdr.h linux/include/linux/lockd/xdr.h
@@ -13,8 +13,15 @@
 #include <linux/nfs.h>
 #include <linux/sunrpc/xdr.h>
 
-extern u32	nlm_granted, nlm_lck_denied, nlm_lck_denied_nolocks,
-		nlm_lck_blocked, nlm_lck_denied_grace_period;
+#define NLM_MAXSTRLEN		1024
+
+#define QUADLEN(len)		(((len) + 3) >> 2)
+
+#define	nlm_granted		__constant_htonl(NLM_LCK_GRANTED)
+#define	nlm_lck_denied		__constant_htonl(NLM_LCK_DENIED)
+#define	nlm_lck_denied_nolocks	__constant_htonl(NLM_LCK_DENIED_NOLOCKS)
+#define	nlm_lck_blocked		__constant_htonl(NLM_LCK_BLOCKED)
+#define	nlm_lck_denied_grace_period	__constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD)
 
 /* Lock info passed via NLM */
 struct nlm_lock {
@@ -48,6 +55,8 @@
 	u32			fsm_access;
 	u32			fsm_mode;
 };
+
+typedef struct nlm_args nlm_args;
 
 /*
  * Generic lockd result

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)