o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 30 insertions, 7 deletions

diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index 3e3410776..d11d8e0c3 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -27,12 +27,12 @@
  * ino/dev of the exported inode.
  */
 struct nfs_fhbase {
-	struct dentry *		fb_dentry;	/* dentry cookie */
-	ino_t			fb_ino;		/* our inode number */
-	ino_t			fb_dirino;	/* dir inode number */
-	dev_t			fb_dev;		/* our device */
-	dev_t			fb_xdev;
-	ino_t			fb_xino;
+	struct dentry *	fb_dentry;	/* dentry cookie */
+	__u32		fb_ino;		/* our inode number */
+	__u32		fb_dirino;	/* dir inode number */
+	__u32		fb_dev;		/* our device */
+	__u32		fb_xdev;
+	__u32		fb_xino;
 };
 
 #define NFS_FH_PADDING		(NFS_FHSIZE - sizeof(struct nfs_fhbase))
@@ -51,6 +51,29 @@ struct knfs_fh {
 #ifdef __KERNEL__
 
 /*
+ * Conversion macros for the filehandle fields.
+ */
+extern inline __u32 kdev_t_to_u32(kdev_t dev)
+{
+	return (__u32) dev;
+}
+
+extern inline kdev_t u32_to_kdev_t(__u32 udev)
+{
+	return (kdev_t) udev;
+}
+
+extern inline __u32 ino_t_to_u32(ino_t ino)
+{
+	return (__u32) ino;
+}
+
+extern inline ino_t u32_to_ino_t(__u32 uino)
+{
+	return (ino_t) uino;
+}
+
+/*
  * This is the internal representation of an NFS handle used in knfsd.
  * pre_mtime/post_version will be used to support wcc_attr's in NFSv3.
  */
@@ -80,7 +103,7 @@ u32	fh_verify(struct svc_rqst *, struct svc_fh *, int, int);
 void	fh_compose(struct svc_fh *, struct svc_export *, struct dentry *);
 void	fh_update(struct svc_fh *);
 void	fh_put(struct svc_fh *);
-void	nfsd_fh_flush(dev_t);
+void	nfsd_fh_flush(kdev_t);
 void	nfsd_fh_init(void);
 void	nfsd_fh_free(void);