lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

isofs: fix Joliet regression

Browse Source 
commit 5404ac8e44 ("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>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-07-10 12:34:27 +02:00
committed by Linus Torvalds
parent d4fc4a7bfc
commit 8711c67bee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/isofs/inode.c
View File

@@ -142,6 +142,7 @@ static const struct dentry_operations isofs_dentry_ops[] = {
struct iso9660_options{ struct iso9660_options{
unsigned int rock:1; unsigned int rock:1;
unsigned int joliet:1;
unsigned int cruft:1; unsigned int cruft:1;
unsigned int hide:1; unsigned int hide:1;
unsigned int showassoc:1; unsigned int showassoc:1;
@@ -151,7 +152,6 @@ struct iso9660_options{
unsigned int gid_set:1; unsigned int gid_set:1;
unsigned int utf8:1; unsigned int utf8:1;
unsigned char map; unsigned char map;
char joliet;
unsigned char check; unsigned char check;
unsigned int blocksize; unsigned int blocksize;
mode_t fmode; mode_t fmode;
@@ -632,7 +632,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
else if (isonum_711(vdp->type) == ISO_VD_SUPPLEMENTARY) { else if (isonum_711(vdp->type) == ISO_VD_SUPPLEMENTARY) {
sec = (struct iso_supplementary_descriptor *)vdp; sec = (struct iso_supplementary_descriptor *)vdp;
if (sec->escape[0] == 0x25 && sec->escape[1] == 0x2f) { if (sec->escape[0] == 0x25 && sec->escape[1] == 0x2f) {
if (opt.joliet == 'y') { if (opt.joliet) {
if (sec->escape[2] == 0x40) if (sec->escape[2] == 0x40)
joliet_level = 1; joliet_level = 1;
else if (sec->escape[2] == 0x43) else if (sec->escape[2] == 0x43)