isofs: fix Joliet regression
Jan Kara
maintainerPATCH 1/1 isofs: fix Joliet regression
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] 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 <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Signed-off-by Jan Kara <[email protected]>
---
Linus, please apply. Thanks.
fs/isofs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/isofs/inode.c +2 -2
@@ -142,6 +142,7 @@ static const struct dentry_operations isstruct iso9660_options {unsigned int rock:1 ; +unsigned int joliet:1 ;unsigned int cruft:1 ;unsigned int hide:1 ;unsigned int showassoc:1 ;
@@ -151,7 +152,6 @@ struct iso9660_options{ unsigned int gid_set:1; unsigned int utf8:1;unsigned char map; -char joliet;unsigned char check;unsigned int blocksize;mode_t fmode;
@@ -632,7 +632,7 @@ static int isofs_fill_super(struct superelse if (isonum_711 (vdp->type) ==ISO_VD_SUPPLEMENTARY ) { sec = (struct iso_supplementary_descriptor *)vdp;if (sec->escape[0 ] ==0x25 && sec->escape[1 ] ==0x2f ) { -if (opt.joliet =='y' ) { +if (opt.joliet) {if (sec->escape[2 ] ==0x40 ) joliet_level =1 ;else if (sec->escape[2 ] ==0x43 )