patch-2.4.0-test7 linux/fs/proc/generic.c

• Lines: 29
• Date: Fri Aug 11 14:29:01 2000
• Orig file: v2.4.0-test6/linux/fs/proc/generic.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test6/linux/fs/proc/generic.c linux/fs/proc/generic.c
@@ -294,15 +294,15 @@
 	i = filp->f_pos;
 	switch (i) {
 		case 0:
-			if (filldir(dirent, ".", 1, i, ino) < 0)
+			if (filldir(dirent, ".", 1, i, ino, DT_DIR) < 0)
 				return 0;
 			i++;
 			filp->f_pos++;
 			/* fall through */
 		case 1:
 			if (filldir(dirent, "..", 2, i,
-				    filp->f_dentry->d_parent->d_inode->i_ino
-				   ) < 0)
+				    filp->f_dentry->d_parent->d_inode->i_ino,
+				    DT_DIR) < 0)
 				return 0;
 			i++;
 			filp->f_pos++;
@@ -320,7 +320,8 @@
 			}
 
 			do {
-				if (filldir(dirent, de->name, de->namelen, filp->f_pos, de->low_ino) < 0)
+				if (filldir(dirent, de->name, de->namelen, filp->f_pos,
+					    de->low_ino, de->mode >> 12) < 0)
 					return 0;
 				filp->f_pos++;
 				de = de->next;