Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
isofs: fix Joliet regression
commit 5404ac8e4418ab3d254950ee4f9bcafc1da20b4a ("isofs: cleanup mount
option processing") missed conversion of joliet option flag resulting
in non-working Joliet support.
CC: walt <w41ter@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Bartlomiej Zolnierkiewicz
and committed by
Linus Torvalds
8711c67b
d4fc4a7b
+2
-2
+2
-2
fs/isofs/inode.c
+2
-2
fs/isofs/inode.c
···
142
142
143
143
struct iso9660_options{
144
144
unsigned int rock:1;
145
+
unsigned int joliet:1;
145
146
unsigned int cruft:1;
146
147
unsigned int hide:1;
147
148
unsigned int showassoc:1;
···
152
151
unsigned int gid_set:1;
153
152
unsigned int utf8:1;
154
153
unsigned char map;
155
-
char joliet;
156
154
unsigned char check;
157
155
unsigned int blocksize;
158
156
mode_t fmode;
···
632
632
else if (isonum_711(vdp->type) == ISO_VD_SUPPLEMENTARY) {
633
633
sec = (struct iso_supplementary_descriptor *)vdp;
634
634
if (sec->escape[0] == 0x25 && sec->escape[1] == 0x2f) {
635
-
if (opt.joliet == 'y') {
635
+
if (opt.joliet) {
636
636
if (sec->escape[2] == 0x40)
637
637
joliet_level = 1;
638
638
else if (sec->escape[2] == 0x43)