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

• Lines: 37
• Date: Thu Dec 18 16:37:02 1997
• Orig file: v2.1.72/linux/fs/isofs/dir.c
• Orig date: Sat Nov 1 11:04:27 1997

diff -u --recursive --new-file v2.1.72/linux/fs/isofs/dir.c linux/fs/isofs/dir.c
@@ -207,22 +207,22 @@
 			}
 		}
 
+		map = 1;
+		if (inode->i_sb->u.isofs_sb.s_rock) {
+			len = get_rock_ridge_filename(de, tmpname, inode);
+			if (len != 0) {
+				p = tmpname;
+				map = 0;
+			}
+		}
+		if (map) {
 #ifdef CONFIG_JOLIET
-		if (inode->i_sb->u.isofs_sb.s_joliet_level) {
-			len = get_joliet_filename(de, inode, tmpname);
-			p = tmpname;
-		} else 
+			if (inode->i_sb->u.isofs_sb.s_joliet_level) {
+				len = get_joliet_filename(de, inode, tmpname);
+				p = tmpname;
+			} else
 #endif
-		/* if not joliet */ {
-			map = 1;
-			if (inode->i_sb->u.isofs_sb.s_rock) {
-				len = get_rock_ridge_filename(de, tmpname, inode);
-				if (len != 0) {
-					p = tmpname;
-					map = 0;
-				}
-			}
-			if (map) {
+			{
 				if (inode->i_sb->u.isofs_sb.s_mapping == 'n') {
 					len = isofs_name_translate(de->name, de->name_len[0],
 								   tmpname);