patch-2.3.99-pre4 linux/include/linux/nfs_fs_i.h

• Lines: 67
• Date: Sun Apr 2 15:31:32 2000
• Orig file: v2.3.99-pre3/linux/include/linux/nfs_fs_i.h
• Orig date: Mon Mar 27 08:08:32 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/include/linux/nfs_fs_i.h linux/include/linux/nfs_fs_i.h
@@ -1,8 +1,8 @@
 #ifndef _NFS_FS_I
 #define _NFS_FS_I
 
-#include <linux/nfs.h>
-#include <linux/pipe_fs_i.h>
+#include <asm/types.h>
+#include <linux/list.h>
 
 /*
  * nfs fs inode data in memory
@@ -11,8 +11,8 @@
 	/*
 	 * The 64bit 'inode number'
 	 */
-	__u32 fsid;
-	__u32 fileid;
+	__u64 fsid;
+	__u64 fileid;
 
 	/*
 	 * Various flags
@@ -37,8 +37,18 @@
 	 *	mtime != read_cache_mtime
 	 */
 	unsigned long		read_cache_jiffies;
-	unsigned long		read_cache_mtime;
+	__u64			read_cache_ctime;
+	__u64			read_cache_mtime;
+	__u64			read_cache_atime;
+	__u64			read_cache_isize;
 	unsigned long		attrtimeo;
+	unsigned long		attrtimeo_timestamp;
+
+	/*
+	 * This is the cookie verifier used for NFSv3 readdir
+	 * operations
+	 */
+	__u32			cookieverf[2];
 
 	/*
 	 * This is the list of dirty unwritten pages.
@@ -55,15 +65,12 @@
 	struct inode		*hash_next,
 				*hash_prev;
 	unsigned long		nextscan;
-
-	/* Readdir caching information. */
-	void *cookies;
-	u32 direof;
 };
 
 /*
  * Legal inode flag values
  */
+#define NFS_INO_ADVISE_RDPLUS   0x0002          /* advise readdirplus */
 #define NFS_INO_REVALIDATING	0x0004		/* revalidating attrs */
 #define NFS_IS_SNAPSHOT		0x0010		/* a snapshot file */
 #define NFS_INO_FLUSH		0x0020		/* inode is due for flushing */
@@ -74,6 +81,7 @@
 struct nfs_lock_info {
 	u32		state;
 	u32		flags;
+	struct nlm_host	*host;
 };
 
 /*