patch-2.3.99-pre6 linux/include/linux/nfs_fs.h

• Lines: 54
• Date: Wed Apr 26 15:29:42 2000
• Orig file: v2.3.99-pre5/linux/include/linux/nfs_fs.h
• Orig date: Tue Apr 11 15:09:25 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/include/linux/nfs_fs.h linux/include/linux/nfs_fs.h
@@ -45,6 +45,7 @@
  * The upper limit on timeouts for the exponential backoff algorithm.
  */
 #define NFS_MAX_RPC_TIMEOUT		(6*HZ)
+#define NFS_READ_DELAY			(2*HZ)
 #define NFS_WRITEBACK_DELAY		(5*HZ)
 #define NFS_WRITEBACK_LOCKDELAY		(60*HZ)
 #define NFS_COMMIT_DELAY		(5*HZ)
@@ -174,12 +175,9 @@
 /*
  * linux/fs/nfs/write.c
  */
-extern int  nfs_writepage(struct dentry *, struct page *);
-extern int  nfs_check_failed_request(struct inode *);
-extern struct nfs_page* nfs_find_request(struct inode *, struct page *);
-extern void nfs_release_request(struct nfs_page *req);
+extern int  nfs_writepage(struct file *file, struct dentry *, struct page *);
 extern int  nfs_flush_incompatible(struct file *file, struct page *page);
-extern int  nfs_updatepage(struct file *, struct page *, unsigned long, unsigned int);
+extern int  nfs_updatepage(struct file *, struct page *, unsigned int, unsigned int);
 /*
  * Try to write back everything synchronously (but check the
  * return value!)
@@ -193,6 +191,12 @@
 #endif
 
 static inline int
+nfs_have_read(struct inode *inode)
+{
+	return !list_empty(&inode->u.nfs_i.read);
+}
+
+static inline int
 nfs_have_writebacks(struct inode *inode)
 {
 	return !list_empty(&inode->u.nfs_i.writeback);
@@ -229,6 +233,8 @@
  * linux/fs/nfs/read.c
  */
 extern int  nfs_readpage(struct dentry *, struct page *);
+extern int  nfs_pagein_inode(struct inode *, unsigned long, unsigned int);
+extern int  nfs_pagein_timeout(struct inode *);
 
 /*
  * linux/fs/mount_clnt.c
@@ -275,7 +281,7 @@
 
 /* NFS root */
 
-extern int nfs_root_mount(struct super_block *sb);
+extern void * nfs_root_data(void);
 
 #define nfs_wait_event(clnt, wq, condition)				\
 ({									\