Fix compile problem in isofs

Steven N. Hirsch (shirsch@ibm.net)
Tue, 28 Oct 1997 07:17:28 -0500 (EST)


All,

When the joliet extensions are not turned on in kernel config, this needs
to happen for isofs to build properly:

Steve

--- linux-2.1.60/fs/isofs/dir.c.orig Sun Oct 26 20:14:03 1997
+++ linux-2.1.60/fs/isofs/dir.c Tue Oct 28 07:11:10 1997
@@ -205,11 +205,12 @@
continue;
}
}
-
+#ifdef CONFIG_JOLIET
if (inode->i_sb->u.isofs_sb.s_joliet_level) {
len = get_joliet_filename(de, inode, tmpname);
p = tmpname;
} else {
+#endif
map = 1;
if (inode->i_sb->u.isofs_sb.s_rock) {
len = get_rock_ridge_filename(de, tmpname, inode);
@@ -228,7 +229,9 @@
len = de->name_len[0];
}
}
+#ifdef CONFIG_JOLIET
}
+#endif
if (len > 0) {
if (filldir(dirent, p, len, filp->f_pos, inode_number) < 0)
break;