patch-2.1.32 linux/include/linux/nfs_fs.h

• Lines: 306
• Date: Fri Apr 4 12:15:40 1997
• Orig file: v2.1.31/linux/include/linux/nfs_fs.h
• Orig date: Thu Feb 6 02:53:33 1997

diff -u --recursive --new-file v2.1.31/linux/include/linux/nfs_fs.h linux/include/linux/nfs_fs.h
@@ -1,6 +1,3 @@
-#ifndef _LINUX_NFS_FS_H
-#define _LINUX_NFS_FS_H
-
 /*
  *  linux/include/linux/nfs_fs.h
  *
@@ -9,26 +6,39 @@
  *  OS-specific nfs filesystem definitions and declarations
  */
 
-#include <linux/nfs.h>
+#ifndef _LINUX_NFS_FS_H
+#define _LINUX_NFS_FS_H
 
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/nfs.h>
 #include <linux/in.h>
+#include <linux/sunrpc/debug.h>
 #include <linux/nfs_mount.h>
 
 /*
- * The readdir cache size controls how many directory entries are cached.
- * Its size is limited by the number of nfs_entry structures that can fit
- * in one page, currently, the limit is 256 when using 4KB pages.
+ * Enable debugging support for nfs client.
+ * Requires RPC_DEBUG.
  */
+#ifdef RPC_DEBUG
+# define NFS_DEBUG
+#endif
 
-#define NFS_READDIR_CACHE_SIZE		64
+/*
+ * NFS_MAX_DIRCACHE controls the number of simultaneously cached
+ * directory chunks. Each chunk holds the list of nfs_entry's returned
+ * in a single readdir call in a memory region of size PAGE_SIZE.
+ *
+ * Note that at most server->rsize bytes of the cache memory are used.
+ */
+#define NFS_MAX_DIRCACHE		16
 
 #define NFS_MAX_FILE_IO_BUFFER_SIZE	16384
-#define NFS_DEF_FILE_IO_BUFFER_SIZE	1024
+#define NFS_DEF_FILE_IO_BUFFER_SIZE	4096
 
 /*
  * The upper limit on timeouts for the exponential backoff algorithm.
  */
-
 #define NFS_MAX_RPC_TIMEOUT		(6*HZ)
 
 /*
@@ -36,113 +46,168 @@
  * It is better not to make this too large although the optimum
  * depends on a usage and environment.
  */
-
 #define NFS_LOOKUP_CACHE_SIZE		64
 
+/*
+ * superblock magic number for NFS
+ */
 #define NFS_SUPER_MAGIC			0x6969
 
 #define NFS_SERVER(inode)		(&(inode)->i_sb->u.nfs_sb.s_server)
+#define NFS_CLIENT(inode)		(NFS_SERVER(inode)->client)
+#define NFS_ADDR(inode)			(RPC_PEERADDR(NFS_CLIENT(inode)))
+#define NFS_CONGESTED(inode)		(RPC_CONGESTED(NFS_CLIENT(inode)))
 #define NFS_FH(inode)			(&(inode)->u.nfs_i.fhandle)
-#define NFS_RENAMED_DIR(inode)		((inode)->u.nfs_i.silly_rename_dir)
+
 #define NFS_READTIME(inode)		((inode)->u.nfs_i.read_cache_jiffies)
 #define NFS_OLDMTIME(inode)		((inode)->u.nfs_i.read_cache_mtime)
-#define NFS_ATTRTIMEO(inode)		((inode)->u.nfs_i.attrtimeo)
-#define NFS_MINATTRTIMEO(inode)		(S_ISREG((inode)->i_mode)?	\
-						NFS_SERVER(inode)->acregmin : \
-						NFS_SERVER(inode)->acdirmin)
 #define NFS_CACHEINV(inode) \
 do { \
 	NFS_READTIME(inode) = jiffies - 1000000; \
 	NFS_OLDMTIME(inode) = 0; \
 } while (0)
+#define NFS_ATTRTIMEO(inode)		((inode)->u.nfs_i.attrtimeo)
+#define NFS_MINATTRTIMEO(inode) \
+	(S_ISDIR(inode->i_mode)? NFS_SERVER(inode)->acdirmin \
+			       : NFS_SERVER(inode)->acregmin)
+#define NFS_MAXATTRTIMEO(inode) \
+	(S_ISDIR(inode->i_mode)? NFS_SERVER(inode)->acdirmax \
+			       : NFS_SERVER(inode)->acregmax)
 
+#define NFS_FLAGS(inode)		((inode)->u.nfs_i.flags)
+#define NFS_REVALIDATING(inode)		(NFS_FLAGS(inode) & NFS_INO_REVALIDATE)
 
-#ifdef __KERNEL__
+#define NFS_RENAMED_DIR(inode)		((inode)->u.nfs_i.silly_inode)
+#define NFS_WRITEBACK(inode)		((inode)->u.nfs_i.writeback)
 
-/* linux/fs/nfs/proc.c */
+/*
+ * These are the default flags for swap requests
+ */
+#define NFS_RPC_SWAPFLAGS		(RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS)
 
+#ifdef __KERNEL__
+
+/*
+ * linux/fs/nfs/proc.c
+ */
 extern int nfs_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle,
-			    struct nfs_fattr *fattr);
+			struct nfs_fattr *fattr);
 extern int nfs_proc_setattr(struct nfs_server *server, struct nfs_fh *fhandle,
-			    struct nfs_sattr *sattr, struct nfs_fattr *fattr);
+			struct nfs_sattr *sattr, struct nfs_fattr *fattr);
 extern int nfs_proc_lookup(struct nfs_server *server, struct nfs_fh *dir,
-			   const char *name, struct nfs_fh *fhandle,
-			   struct nfs_fattr *fattr);
+			const char *name, struct nfs_fh *fhandle,
+			struct nfs_fattr *fattr);
 extern int nfs_proc_readlink(struct nfs_server *server, struct nfs_fh *fhandle,
-			int **p0, char **string, unsigned int *len,
+			void **p0, char **string, unsigned int *len,
 			unsigned int maxlen);
 extern int nfs_proc_read(struct nfs_server *server, struct nfs_fh *fhandle,
-			 int offset, int count, char *data,
-			 struct nfs_fattr *fattr);
-extern int nfs_proc_write(struct inode * inode, int offset,
-			  int count, const char *data, struct nfs_fattr *fattr);
+			int swap, unsigned long offset, unsigned int count,
+			void *buffer, struct nfs_fattr *fattr);
+extern int nfs_proc_write(struct nfs_server *server, struct nfs_fh *fhandle,
+			int swap, unsigned long offset, unsigned int count,
+			const void *buffer, struct nfs_fattr *fattr);
 extern int nfs_proc_create(struct nfs_server *server, struct nfs_fh *dir,
-			   const char *name, struct nfs_sattr *sattr,
-			   struct nfs_fh *fhandle, struct nfs_fattr *fattr);
+			const char *name, struct nfs_sattr *sattr,
+			struct nfs_fh *fhandle, struct nfs_fattr *fattr);
 extern int nfs_proc_remove(struct nfs_server *server, struct nfs_fh *dir,
-			   const char *name);
+			const char *name);
 extern int nfs_proc_rename(struct nfs_server *server,
-			   struct nfs_fh *old_dir, const char *old_name,
-			   struct nfs_fh *new_dir, const char *new_name,
-			   int must_be_dir);
+			struct nfs_fh *old_dir, const char *old_name,
+			struct nfs_fh *new_dir, const char *new_name);
 extern int nfs_proc_link(struct nfs_server *server, struct nfs_fh *fhandle,
-			 struct nfs_fh *dir, const char *name);
+			struct nfs_fh *dir, const char *name);
 extern int nfs_proc_symlink(struct nfs_server *server, struct nfs_fh *dir,
-			    const char *name, const char *path, struct nfs_sattr *sattr);
+			const char *name, const char *path,
+			struct nfs_sattr *sattr);
 extern int nfs_proc_mkdir(struct nfs_server *server, struct nfs_fh *dir,
-			  const char *name, struct nfs_sattr *sattr,
-			  struct nfs_fh *fhandle, struct nfs_fattr *fattr);
+			const char *name, struct nfs_sattr *sattr,
+			struct nfs_fh *fhandle, struct nfs_fattr *fattr);
 extern int nfs_proc_rmdir(struct nfs_server *server, struct nfs_fh *dir,
-			  const char *name);
+			const char *name);
 extern int nfs_proc_readdir(struct nfs_server *server, struct nfs_fh *fhandle,
-			    int cookie, int count, struct nfs_entry *entry);
+			u32 cookie, unsigned int size, struct nfs_entry *entry);
 extern int nfs_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle,
-			    struct nfs_fsinfo *res);
-extern int nfs_proc_read_request(struct rpc_ioreq *, struct nfs_server *,
-				 struct nfs_fh *, unsigned long offset,
-				 unsigned long count, __u32 *buf);
-extern int nfs_proc_read_reply(struct rpc_ioreq *, struct nfs_fattr *);
-extern int *rpc_header(int *p, int procedure, int program, int version,
-				int uid, int gid, int ngroup, gid_t *groups);
-extern int *rpc_verify(int *p);
-
-/* linux/fs/nfs/sock.c */
-
-extern int nfs_rpc_call(struct nfs_server *server, int *start,
-				int *end, int size);
-extern int nfs_rpc_doio(struct nfs_server *server, struct rpc_ioreq *,
-				int async);
+			struct nfs_fsinfo *res);
 
-/* linux/fs/nfs/inode.c */
 
+/*
+ * linux/fs/nfs/inode.c
+ */
 extern struct super_block *nfs_read_super(struct super_block *sb, 
 					  void *data,int);
 extern int init_nfs_fs(void);
 extern struct inode *nfs_fhget(struct super_block *sb, struct nfs_fh *fhandle,
 			       struct nfs_fattr *fattr);
 extern void nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr);
+extern int nfs_revalidate(struct inode *);
+extern int _nfs_revalidate_inode(struct nfs_server *, struct inode *);
 
-/* linux/fs/nfs/file.c */
-
+/*
+ * linux/fs/nfs/file.c
+ */
 extern struct inode_operations nfs_file_inode_operations;
 
-/* linux/fs/nfs/dir.c */
-
+/*
+ * linux/fs/nfs/dir.c
+ */
 extern struct inode_operations nfs_dir_inode_operations;
 extern void nfs_sillyrename_cleanup(struct inode *);
-extern void nfs_kfree_cache(void);
-
-/* linux/fs/nfs/symlink.c */
+extern void nfs_free_dircache(void);
+extern void nfs_invalidate_dircache(struct inode *);
 
+/*
+ * linux/fs/nfs/symlink.c
+ */
 extern struct inode_operations nfs_symlink_inode_operations;
 
-/* linux/fs/nfs/mmap.c */
+/*
+ * linux/fs/nfs/mmap.c
+ */
+extern int nfs_mmap(struct inode *inode, struct file *file,
+			struct vm_area_struct * vma);
 
-extern int nfs_mmap(struct inode * inode, struct file * file, struct vm_area_struct * vma);
+/*
+ * linux/fs/nfs/locks.c
+ */
+extern int nfs_lock(struct inode *inode, struct file *file,
+			int cmd, struct file_lock *fl);
 
-/* linux/fs/nfs/bio.c */
+/*
+ * linux/fs/nfs/write.c
+ */
+extern int  nfs_writepage(struct inode *, struct page *);
+extern int  nfs_check_error(struct inode *);
+extern int  nfs_flush_dirty_pages(struct inode *, off_t, off_t);
+extern int  nfs_truncate_dirty_pages(struct inode *, unsigned long);
+extern void nfs_invalidate_pages(struct inode *);
+extern int  nfs_updatepage(struct inode *, struct page *, const char *,
+			unsigned long, unsigned int, int);
+
+/*
+ * linux/fs/nfs/read.c
+ */
+extern int  nfs_readpage(struct inode *, struct page *);
+extern int  nfs_readpage_sync(struct inode *, struct page *);
 
-extern int nfs_readpage(struct inode *, struct page *);
+/*
+ * inline functions
+ */
+static inline int
+nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
+{
+	if (jiffies - NFS_READTIME(inode) < NFS_ATTRTIMEO(inode))
+		return 0;
+	return _nfs_revalidate_inode(server, inode);
+}
+
+extern struct nfs_wreq *	nfs_failed_requests;
+static inline int
+nfs_write_error(struct inode *inode)
+{
+	if (nfs_failed_requests == NULL)
+		return 0;
+	return nfs_check_error(inode);
+}
 
 /* NFS root */
 
@@ -156,5 +221,26 @@
 extern char nfs_root_addrs[];
 
 #endif /* __KERNEL__ */
+
+/*
+ * NFS debug flags
+ */
+#define NFSDBG_VFS		0x0001
+#define NFSDBG_DIRCACHE		0x0002
+#define NFSDBG_LOOKUPCACHE	0x0004
+#define NFSDBG_PAGECACHE	0x0008
+#define NFSDBG_PROC		0x0010
+#define NFSDBG_XDR		0x0020
+#define NFSDBG_FILE		0x0040
+#define NFSDBG_ALL		0xFFFF
+
+#ifdef __KERNEL__
+# undef ifdebug
+# ifdef NFS_DEBUG
+#  define ifdebug(fac)		if (nfs_debug & NFSDBG_##fac)
+# else
+#  define ifdebug(fac)		if (0)
+# endif
+#endif /* __KERNEL */
 
 #endif