Skip to contentSkip to conversation

isofs: fix Joliet regression

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Jul 8, 2009 – Jul 10, 2009 Isofs filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
I really want to believe that this is just the unlucky coincidence with the ongoing vfat madness...

 fs/isofs/inode.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/isofs/inode.c +2 -2
Index: b/fs/isofs/inode.c
===================================================================
@@ -142,6 +142,7 @@ static const struct dentry_operations is
 
 struct 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 super
 			else 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)
maintainer
#1 lore raw
Quoted 11 lines · Bartlomiej Zolnierkiewicz

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.

---
I really want to believe that this is just the unlucky coincidence with the ongoing vfat madness...

Thanks for the fix. I've just tracked this down as well and wanted to write
a fix :) I'll send the patch to Linus for inclusion.

Honza

Quoted 32 lines
 fs/isofs/inode.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/fs/isofs/inode.c
===================================================================

fs/isofs/inode.c +2 -2
@@ -142,6 +142,7 @@ static const struct dentry_operations is
 
 struct 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 super
 			else 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)
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR