patch-2.4.9 linux/fs/isofs/inode.c

• Lines: 17
• Date: Sun Aug 12 10:56:56 2001
• Orig file: v2.4.8/linux/fs/isofs/inode.c
• Orig date: Wed Apr 18 11:49:13 2001

diff -u --recursive --new-file v2.4.8/linux/fs/isofs/inode.c linux/fs/isofs/inode.c
@@ -744,7 +744,7 @@
 		if (! s->u.isofs_sb.s_nls_iocharset) {
 			/* Fail only if explicit charset specified */
 			if (opt.iocharset)
-				goto out_freebh;
+				goto out_unlock;
 			s->u.isofs_sb.s_nls_iocharset = load_nls_default();
 		}
 	}
@@ -752,6 +752,7 @@
 	s->s_op = &isofs_sops;
 	s->u.isofs_sb.s_mapping = opt.map;
 	s->u.isofs_sb.s_rock = (opt.rock == 'y' ? 2 : 0);
+	s->u.isofs_sb.s_rock_offset = -1; /* initial offset, will guess until SP is found*/
 	s->u.isofs_sb.s_cruft = opt.cruft;
 	s->u.isofs_sb.s_unhide = opt.unhide;
 	s->u.isofs_sb.s_uid = opt.uid;