diff options
Diffstat (limited to 'fs/isofs')
-rw-r--r-- | fs/isofs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 58a7963e168a..85f96bc651c7 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
@@ -142,6 +142,7 @@ static const struct dentry_operations isofs_dentry_ops[] = { | |||
142 | 142 | ||
143 | struct iso9660_options{ | 143 | struct iso9660_options{ |
144 | unsigned int rock:1; | 144 | unsigned int rock:1; |
145 | unsigned int joliet:1; | ||
145 | unsigned int cruft:1; | 146 | unsigned int cruft:1; |
146 | unsigned int hide:1; | 147 | unsigned int hide:1; |
147 | unsigned int showassoc:1; | 148 | unsigned int showassoc:1; |
@@ -151,7 +152,6 @@ struct iso9660_options{ | |||
151 | unsigned int gid_set:1; | 152 | unsigned int gid_set:1; |
152 | unsigned int utf8:1; | 153 | unsigned int utf8:1; |
153 | unsigned char map; | 154 | unsigned char map; |
154 | char joliet; | ||
155 | unsigned char check; | 155 | unsigned char check; |
156 | unsigned int blocksize; | 156 | unsigned int blocksize; |
157 | mode_t fmode; | 157 | mode_t fmode; |
@@ -632,7 +632,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) | |||
632 | else if (isonum_711(vdp->type) == ISO_VD_SUPPLEMENTARY) { | 632 | else if (isonum_711(vdp->type) == ISO_VD_SUPPLEMENTARY) { |
633 | sec = (struct iso_supplementary_descriptor *)vdp; | 633 | sec = (struct iso_supplementary_descriptor *)vdp; |
634 | if (sec->escape[0] == 0x25 && sec->escape[1] == 0x2f) { | 634 | if (sec->escape[0] == 0x25 && sec->escape[1] == 0x2f) { |
635 | if (opt.joliet == 'y') { | 635 | if (opt.joliet) { |
636 | if (sec->escape[2] == 0x40) | 636 | if (sec->escape[2] == 0x40) |
637 | joliet_level = 1; | 637 | joliet_level = 1; |
638 | else if (sec->escape[2] == 0x43) | 638 | else if (sec->escape[2] == 0x43) |