patch-2.4.0-test7 linux/fs/devfs/base.c

• Lines: 26
• Date: Fri Aug 11 14:29:02 2000
• Orig file: v2.4.0-test6/linux/fs/devfs/base.c
• Orig date: Thu Jul 27 17:38:01 2000

diff -u --recursive --new-file v2.4.0-test6/linux/fs/devfs/base.c linux/fs/devfs/base.c
@@ -2439,14 +2439,14 @@
       case 0:
 	scan_dir_for_removable (parent);
 	err = (*filldir) (dirent, "..", 2, file->f_pos,
-			  file->f_dentry->d_parent->d_inode->i_ino);
+			  file->f_dentry->d_parent->d_inode->i_ino, DT_DIR);
 	if (err == -EINVAL) break;
 	if (err < 0) return err;
 	file->f_pos++;
 	++stored;
 	/*  Fall through  */
       case 1:
-	err = (*filldir) (dirent, ".", 1, file->f_pos, inode->i_ino);
+	err = (*filldir) (dirent, ".", 1, file->f_pos, inode->i_ino, DT_DIR);
 	if (err == -EINVAL) break;
 	if (err < 0) return err;
 	file->f_pos++;
@@ -2463,7 +2463,7 @@
 	{
 	    if ( IS_HIDDEN (de) ) continue;
 	    err = (*filldir) (dirent, de->name, de->namelen,
-			      file->f_pos, de->inode.ino);
+			      file->f_pos, de->inode.ino, de->mode >> 12);
 	    if (err == -EINVAL) break;
 	    if (err < 0) return err;
 	    file->f_pos++;