Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8711c67b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds
Browse files

isofs: fix Joliet regression 



commit 5404ac8e ("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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d4fc4a7b

fs/isofs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static const struct dentry_operations isofs_dentry_ops[] = { 


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_block *s, void *data, int silent) 
			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)