patch-2.4.0-test7 linux/fs/nfs/dir.c

• Lines: 31
• Date: Mon Aug 21 13:00:25 2000
• Orig file: v2.4.0-test6/linux/fs/nfs/dir.c
• Orig date: Mon Jul 10 16:47:26 2000

diff -u --recursive --new-file v2.4.0-test6/linux/fs/nfs/dir.c linux/fs/nfs/dir.c
@@ -264,7 +264,7 @@
 		 *	 retrieving the current dirent on the server */
 		fileid = nfs_fileid_to_ino_t(entry->ino);
 		res = filldir(dirent, entry->name, entry->len, 
-			      entry->prev_cookie, fileid);
+			      entry->prev_cookie, fileid, DT_UNKNOWN);
 		if (res < 0)
 			break;
 		file->f_pos = desc->target = entry->cookie;
@@ -890,9 +890,8 @@
 	struct inode *inode = dentry->d_inode;
 	int error = -EBUSY, rehash = 0;
 		
-	dfprintk(VFS, "NFS: safe_remove(%s/%s, %ld)\n",
-		dentry->d_parent->d_name.name, dentry->d_name.name,
-		inode->i_ino);
+	dfprintk(VFS, "NFS: safe_remove(%s/%s)\n",
+		dentry->d_parent->d_name.name, dentry->d_name.name);
 
 	/*
 	 * Unhash the dentry while we remove the file ...
@@ -910,7 +909,8 @@
 		goto out;
 	}
 	nfs_zap_caches(dir_i);
-	NFS_CACHEINV(inode);
+	if (inode)
+		NFS_CACHEINV(inode);
 	error = NFS_PROTO(dir_i)->remove(dir, &dentry->d_name);
 	if (error < 0)
 		goto out;