patch-2.4.0-test5 linux/include/linux/fs.h

• Lines: 57
• Date: Thu Jul 27 17:02:02 2000
• Orig file: v2.4.0-test4/linux/include/linux/fs.h
• Orig date: Mon Jul 10 16:47:27 2000

diff -u --recursive --new-file v2.4.0-test4/linux/include/linux/fs.h linux/include/linux/fs.h
@@ -73,7 +73,6 @@
 
 #define WRITERAW 5	/* raw write - don't play with buffer lists */
 
-#define NIL_FILP	((struct file *)0)
 #define SEL_IN		1
 #define SEL_OUT		2
 #define SEL_EX		4
@@ -194,8 +193,6 @@
 
 extern void buffer_init(unsigned long);
 extern void inode_init(unsigned long);
-extern void file_table_init(void);
-extern void dcache_init(unsigned long);
 
 /* bh state bits */
 #define BH_Uptodate	0	/* 1 if the buffer contains valid data */
@@ -239,11 +236,10 @@
 	char * b_data;			/* pointer to data block (512 byte) */
 	struct page *b_page;		/* the page this bh is mapped to */
 	void (*b_end_io)(struct buffer_head *bh, int uptodate); /* I/O completion */
-	void *b_dev_id;
+ 	void *b_private;		/* reserved for b_end_io */
 
 	unsigned long b_rsector;	/* Real buffer location on disk */
 	wait_queue_head_t b_wait;
-	struct kiobuf * b_kiobuf;	/* kiobuf which owns this IO */
 };
 
 typedef void (bh_end_io_t)(struct buffer_head *bh, int uptodate);
@@ -804,7 +800,7 @@
 /* Alas, no aliases. Too much hassle with bringing module.h everywhere */
 #define fops_get(fops) \
 	(((fops) && (fops)->owner)	\
-		? __MOD_INC_USE_COUNT((fops)->owner), (fops) \
+		? ( try_inc_mod_count((fops)->owner) ? (fops) : NULL ) \
 		: (fops))
 
 #define fops_put(fops) \
@@ -884,6 +880,9 @@
 extern int filp_close(struct file *, fl_owner_t id);
 extern char * getname(const char *);
 
+/* fs/dcache.c */
+extern void vfs_caches_init(unsigned long);
+
 #define __getname()	kmem_cache_alloc(names_cachep, SLAB_KERNEL)
 #define putname(name)	kmem_cache_free(names_cachep, (void *)(name))
 
@@ -901,7 +900,6 @@
 
 /* fs/devices.c */
 extern const struct block_device_operations *get_blkfops(unsigned int);
-extern struct file_operations *get_chrfops(unsigned int, unsigned int);
 extern int register_chrdev(unsigned int, const char *, struct file_operations *);
 extern int unregister_chrdev(unsigned int, const char *);
 extern int chrdev_open(struct inode *, struct file *);