patch-2.3.99-pre7 linux/include/linux/dcache.h

• Lines: 44
• Date: Thu May 11 11:26:54 2000
• Orig file: v2.3.99-pre6/linux/include/linux/dcache.h
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/include/linux/dcache.h linux/include/linux/dcache.h
@@ -61,8 +61,7 @@
 	unsigned int d_flags;
 	struct inode  * d_inode;	/* Where the name belongs to - NULL is negative */
 	struct dentry * d_parent;	/* parent directory */
-	struct dentry * d_mounts;	/* mount information */
-	struct dentry * d_covers;
+	struct list_head d_vfsmnt;
 	struct list_head d_hash;	/* lookup hash list */
 	struct list_head d_lru;		/* d_count = 0 LRU list */
 	struct list_head d_child;	/* child of parent list */
@@ -151,18 +150,18 @@
 #define shrink_dcache() prune_dcache(0)
 struct zone_struct;
 /* dcache memory management */
-extern int shrink_dcache_memory(int, unsigned int, struct zone_struct *);
+extern int shrink_dcache_memory(int, unsigned int);
 extern void prune_dcache(int);
 
 /* icache memory management (defined in linux/fs/inode.c) */
-extern int shrink_icache_memory(int, int, struct zone_struct *);
+extern int shrink_icache_memory(int, int);
 extern void prune_icache(int);
 
 /* only used at mount-time */
 extern struct dentry * d_alloc_root(struct inode *);
 
 /* test whether root is busy without destroying dcache */
-extern int is_root_busy(struct dentry *);
+extern int d_active_refs(struct dentry *);
 
 /* test whether we have any submounts in a subdir tree */
 extern int have_submounts(struct dentry *);
@@ -235,10 +234,9 @@
 
 extern void dput(struct dentry *);
 
-/* MOUNT_REWRITE: replace with the check for d_vfsmnt */
 static __inline__ int d_mountpoint(struct dentry *dentry)
 {
-	return dentry != dentry->d_mounts;
+	return !list_empty(&dentry->d_vfsmnt);
 }