patch-2.1.111 linux/fs/proc/generic.c

• Lines: 21
• Date: Tue Jul 21 11:39:16 1998
• Orig file: v2.1.110/linux/fs/proc/generic.c
• Orig date: Thu May 14 19:47:43 1998

diff -u --recursive --new-file v2.1.110/linux/fs/proc/generic.c linux/fs/proc/generic.c
@@ -260,13 +260,16 @@
 	ent->name = ((char *) ent) + sizeof(*ent);
 	ent->namelen = len;
 
-	if (mode == S_IFDIR) {
+	if (S_ISDIR(mode)) {
+		if ((mode & S_IALLUGO) == 0)
 		mode |= S_IRUGO | S_IXUGO;
 		ent->ops = &proc_dyna_dir_inode_operations;
 		ent->nlink = 2;
-	}
-	else if (mode == 0) {
-		mode = S_IFREG | S_IRUGO;
+	} else {
+		if ((mode & S_IFMT) == 0)
+			mode |= S_IFREG;
+		if ((mode & S_IALLUGO) == 0)
+			mode |= S_IRUGO;
 		ent->nlink = 1;
 	}
 	ent->mode = mode;