patch-2.3.1 linux/fs/nfs/dir.c

• Lines: 28
• Date: Tue May 11 14:37:40 1999
• Orig file: v2.3.0/linux/fs/nfs/dir.c
• Orig date: Sat May 8 23:18:22 1999

diff -u --recursive --new-file v2.3.0/linux/fs/nfs/dir.c linux/fs/nfs/dir.c
@@ -45,7 +45,7 @@
 	unsigned int		size;		/* # of entries */
 	unsigned long		age;		/* last used */
 	unsigned long		mtime;		/* last attr stamp */
-	struct wait_queue *	wait;
+	wait_queue_head_t	wait;
 	__u32 *			entry;		/* three __u32's per entry */
 };
 
@@ -124,8 +124,8 @@
 {
 	struct dentry 		*dentry = filp->f_dentry;
 	struct inode 		*inode = dentry->d_inode;
-	static struct wait_queue *readdir_wait = NULL;
-	struct wait_queue	**waitp = NULL;
+	static DECLARE_WAIT_QUEUE_HEAD(readdir_wait);
+	wait_queue_head_t	*waitp = NULL;
 	struct nfs_dirent	*cache, *free;
 	unsigned long		age, dead;
 	u32			cookie;
@@ -231,6 +231,7 @@
 		cache->valid  = 0;
 		cache->dev    = inode->i_dev;
 		cache->ino    = inode->i_ino;
+		init_waitqueue_head(&cache->wait);
 		if (!cache->entry) {
 			result = -ENOMEM;
 			cache->entry = (__u32 *) get_free_page(GFP_KERNEL);