patch-2.1.61 linux/fs/isofs/dir.c

• Lines: 23
• Date: Wed Oct 29 15:42:28 1997
• Orig file: v2.1.60/linux/fs/isofs/dir.c
• Orig date: Sat Oct 25 02:44:17 1997

diff -u --recursive --new-file v2.1.60/linux/fs/isofs/dir.c linux/fs/isofs/dir.c
@@ -20,6 +20,7 @@
 #include <linux/malloc.h>
 #include <linux/sched.h>
 #include <linux/locks.h>
+#include <linux/config.h>
 
 #include <asm/uaccess.h>
 
@@ -206,10 +207,13 @@
 			}
 		}
 
+#ifdef CONFIG_JOLIET
 		if (inode->i_sb->u.isofs_sb.s_joliet_level) {
 			len = get_joliet_filename(de, inode, tmpname);
 			p = tmpname;
-		} else {
+		} else 
+#endif
+		/* if not joliet */ {
 			map = 1;
 			if (inode->i_sb->u.isofs_sb.s_rock) {
 				len = get_rock_ridge_filename(de, tmpname, inode);