Header fixups for IDmap, so that the client and server headers can be included
together.


 nfs/idmap.c               |    0 
 include/linux/idmap.h     |    9 ++++++++-
 include/linux/nfs_idmap.h |   22 +---------------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff -puN include/linux/nfs_idmap.h~idmap_client_fixup include/linux/nfs_idmap.h
--- linux-2.5.68/include/linux/nfs_idmap.h~idmap_client_fixup	2003-05-18 02:47:51.000000000 -0400
+++ linux-2.5.68-marius/include/linux/nfs_idmap.h	2003-05-18 02:47:51.000000000 -0400
@@ -37,27 +37,7 @@
 #ifndef NFS_IDMAP_H
 #define NFS_IDMAP_H
 
-/* XXX from bits/utmp.h  */
-#define IDMAP_NAMESZ  128
-
-#define IDMAP_TYPE_USER  0
-#define IDMAP_TYPE_GROUP 1
-
-#define IDMAP_CONV_IDTONAME 0
-#define IDMAP_CONV_NAMETOID 1
-
-#define IDMAP_STATUS_INVALIDMSG 0x01
-#define IDMAP_STATUS_AGAIN      0x02
-#define IDMAP_STATUS_LOOKUPFAIL 0x04
-#define IDMAP_STATUS_SUCCESS    0x08
-
-struct idmap_msg {
-	u_int8_t  im_type;
-	u_int8_t  im_conv;
-	char      im_name[IDMAP_NAMESZ];
-	u_int32_t im_id;
-	u_int8_t  im_status;
-};
+#include <linux/idmap.h>
 
 #ifdef __KERNEL__
 void      *nfs_idmap_new(struct nfs_server *);
diff -puN include/linux/idmap.h~idmap_client_fixup include/linux/idmap.h
--- linux-2.5.68/include/linux/idmap.h~idmap_client_fixup	2003-05-18 02:47:51.000000000 -0400
+++ linux-2.5.68-marius/include/linux/idmap.h	2003-05-18 02:47:51.000000000 -0400
@@ -1,7 +1,7 @@
 /*
  * include/linux/idmap.h
  *
- *  Message specification for UID and GID to name mapping for clients.
+ *  Common message specification for UID and GID to name mapping for clients.
  *
  *  Copyright (c) 2003 The Regents of the University of Michigan.
  *  All rights reserved.
@@ -43,11 +43,18 @@
 #define IDMAP_TRANS_IDTONAME 0
 #define IDMAP_TRANS_NAMETOID 1
 
+/* Legacy.  Ugh. */
+#define IDMAP_CONV_IDTONAME IDMAP_TRANS_IDTONAME
+#define IDMAP_CONV_NAMETOID IDMAP_TRANS_NAMETOID
+
 #define IDMAP_STATUS_INVALIDMSG 0x01
 #define IDMAP_STATUS_AGAIN      0x02
 #define IDMAP_STATUS_FAIL       0x04
 #define IDMAP_STATUS_SUCCESS    0x08
 
+#define IDMAP_STATUS_LOOKUPFAIL IDMAP_STATUS_FAIL
+
+
 /* XXX get (include) from bits/utmp.h */
 #define IDMAP_NAMESZ  128
 
diff -puN fs/nfs/idmap.c~idmap_client_fixup fs/nfs/idmap.c

_