From 06ec3b8b488e5430d0021e0fe4c251fa42ad4ee6 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 10 Jul 2009 12:34:27 +0200
Subject: [PATCH] --- yaml --- r: 155317 b: refs/heads/master c:
 8711c67bee675b4f7a378c71ad5a59c981ec3df0 h: refs/heads/master i:   155315:
 d3ec8e9089b2446e23bd1b957de3434e27d2eed1 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/isofs/inode.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c3eca81582e7..d2f0345fd143 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4fc4a7bfc2dee626f4fec1e209e58eaa4312de6
+refs/heads/master: 8711c67bee675b4f7a378c71ad5a59c981ec3df0
diff --git a/trunk/fs/isofs/inode.c b/trunk/fs/isofs/inode.c
index 58a7963e168a..85f96bc651c7 100644
--- a/trunk/fs/isofs/inode.c
+++ b/trunk/fs/isofs/inode.c
@@ -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)