inode.c (9eb7f2c67c41d2cd730aedcd23e5baca09211d03) inode.c (9769f4eb3fad2dd53a5d24c81ee5f7f05450742b)
1/*
2 * linux/fs/isofs/inode.c
3 *
4 * (C) 1991 Linus Torvalds - minix filesystem
5 * 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem.
6 * 1994 Eberhard Moenkeberg - multi session handling.
7 * 1995 Mark Dobie - allow mounting of some weird VideoCDs and PhotoCDs.
8 * 1997 Gordon Chaffee - Joliet CDs

--- 130 unchanged lines hidden (view full) ---

139#endif
140};
141
142struct iso9660_options{
143 char map;
144 char rock;
145 char joliet;
146 char cruft;
1/*
2 * linux/fs/isofs/inode.c
3 *
4 * (C) 1991 Linus Torvalds - minix filesystem
5 * 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem.
6 * 1994 Eberhard Moenkeberg - multi session handling.
7 * 1995 Mark Dobie - allow mounting of some weird VideoCDs and PhotoCDs.
8 * 1997 Gordon Chaffee - Joliet CDs

--- 130 unchanged lines hidden (view full) ---

139#endif
140};
141
142struct iso9660_options{
143 char map;
144 char rock;
145 char joliet;
146 char cruft;
147 char unhide;
147 char hide;
148 char showassoc;
148 char nocompress;
149 unsigned char check;
150 unsigned int blocksize;
151 mode_t mode;
152 gid_t gid;
153 uid_t uid;
154 char *iocharset;
155 unsigned char utf8;

--- 148 unchanged lines hidden (view full) ---

304 return isofs_dentry_cmpi_common(dentry, a, b, 1);
305}
306#endif
307
308enum {
309 Opt_block, Opt_check_r, Opt_check_s, Opt_cruft, Opt_gid, Opt_ignore,
310 Opt_iocharset, Opt_map_a, Opt_map_n, Opt_map_o, Opt_mode, Opt_nojoliet,
311 Opt_norock, Opt_sb, Opt_session, Opt_uid, Opt_unhide, Opt_utf8, Opt_err,
149 char nocompress;
150 unsigned char check;
151 unsigned int blocksize;
152 mode_t mode;
153 gid_t gid;
154 uid_t uid;
155 char *iocharset;
156 unsigned char utf8;

--- 148 unchanged lines hidden (view full) ---

305 return isofs_dentry_cmpi_common(dentry, a, b, 1);
306}
307#endif
308
309enum {
310 Opt_block, Opt_check_r, Opt_check_s, Opt_cruft, Opt_gid, Opt_ignore,
311 Opt_iocharset, Opt_map_a, Opt_map_n, Opt_map_o, Opt_mode, Opt_nojoliet,
312 Opt_norock, Opt_sb, Opt_session, Opt_uid, Opt_unhide, Opt_utf8, Opt_err,
312 Opt_nocompress,
313 Opt_nocompress, Opt_hide, Opt_showassoc,
313};
314
315static match_table_t tokens = {
316 {Opt_norock, "norock"},
317 {Opt_nojoliet, "nojoliet"},
318 {Opt_unhide, "unhide"},
314};
315
316static match_table_t tokens = {
317 {Opt_norock, "norock"},
318 {Opt_nojoliet, "nojoliet"},
319 {Opt_unhide, "unhide"},
320 {Opt_hide, "hide"},
321 {Opt_showassoc, "showassoc"},
319 {Opt_cruft, "cruft"},
320 {Opt_utf8, "utf8"},
321 {Opt_iocharset, "iocharset=%s"},
322 {Opt_map_a, "map=acorn"},
323 {Opt_map_a, "map=a"},
324 {Opt_map_n, "map=normal"},
325 {Opt_map_n, "map=n"},
326 {Opt_map_o, "map=off"},

--- 24 unchanged lines hidden (view full) ---

351{
352 char *p;
353 int option;
354
355 popt->map = 'n';
356 popt->rock = 'y';
357 popt->joliet = 'y';
358 popt->cruft = 'n';
322 {Opt_cruft, "cruft"},
323 {Opt_utf8, "utf8"},
324 {Opt_iocharset, "iocharset=%s"},
325 {Opt_map_a, "map=acorn"},
326 {Opt_map_a, "map=a"},
327 {Opt_map_n, "map=normal"},
328 {Opt_map_n, "map=n"},
329 {Opt_map_o, "map=off"},

--- 24 unchanged lines hidden (view full) ---

354{
355 char *p;
356 int option;
357
358 popt->map = 'n';
359 popt->rock = 'y';
360 popt->joliet = 'y';
361 popt->cruft = 'n';
359 popt->unhide = 'n';
362 popt->hide = 'n';
363 popt->showassoc = 'n';
360 popt->check = 'u'; /* unset */
361 popt->nocompress = 0;
362 popt->blocksize = 1024;
363 popt->mode = S_IRUGO | S_IXUGO; /* r-x for all. The disc could
364 be shared with DOS machines so
365 virtually anything could be
366 a valid executable. */
367 popt->gid = 0;

--- 16 unchanged lines hidden (view full) ---

384 token = match_token(p, tokens, args);
385 switch (token) {
386 case Opt_norock:
387 popt->rock = 'n';
388 break;
389 case Opt_nojoliet:
390 popt->joliet = 'n';
391 break;
364 popt->check = 'u'; /* unset */
365 popt->nocompress = 0;
366 popt->blocksize = 1024;
367 popt->mode = S_IRUGO | S_IXUGO; /* r-x for all. The disc could
368 be shared with DOS machines so
369 virtually anything could be
370 a valid executable. */
371 popt->gid = 0;

--- 16 unchanged lines hidden (view full) ---

388 token = match_token(p, tokens, args);
389 switch (token) {
390 case Opt_norock:
391 popt->rock = 'n';
392 break;
393 case Opt_nojoliet:
394 popt->joliet = 'n';
395 break;
396 case Opt_hide:
397 popt->hide = 'y';
398 break;
392 case Opt_unhide:
399 case Opt_unhide:
393 popt->unhide = 'y';
400 case Opt_showassoc:
401 popt->showassoc = 'y';
394 break;
395 case Opt_cruft:
396 popt->cruft = 'y';
397 break;
398 case Opt_utf8:
399 popt->utf8 = 1;
400 break;
401#ifdef CONFIG_JOLIET

--- 377 unchanged lines hidden (view full) ---

779 }
780#endif
781 s->s_op = &isofs_sops;
782 s->s_export_op = &isofs_export_ops;
783 sbi->s_mapping = opt.map;
784 sbi->s_rock = (opt.rock == 'y' ? 2 : 0);
785 sbi->s_rock_offset = -1; /* initial offset, will guess until SP is found*/
786 sbi->s_cruft = opt.cruft;
402 break;
403 case Opt_cruft:
404 popt->cruft = 'y';
405 break;
406 case Opt_utf8:
407 popt->utf8 = 1;
408 break;
409#ifdef CONFIG_JOLIET

--- 377 unchanged lines hidden (view full) ---

787 }
788#endif
789 s->s_op = &isofs_sops;
790 s->s_export_op = &isofs_export_ops;
791 sbi->s_mapping = opt.map;
792 sbi->s_rock = (opt.rock == 'y' ? 2 : 0);
793 sbi->s_rock_offset = -1; /* initial offset, will guess until SP is found*/
794 sbi->s_cruft = opt.cruft;
787 sbi->s_unhide = opt.unhide;
795 sbi->s_hide = opt.hide;
796 sbi->s_showassoc = opt.showassoc;
788 sbi->s_uid = opt.uid;
789 sbi->s_gid = opt.gid;
790 sbi->s_utf8 = opt.utf8;
791 sbi->s_nocompress = opt.nocompress;
792 /*
793 * It would be incredibly stupid to allow people to mark every file
794 * on the disk as suid, so we merely allow them to set the default
795 * permissions.

--- 652 unchanged lines hidden --- 		797 sbi->s_uid = opt.uid;
798 sbi->s_gid = opt.gid;
799 sbi->s_utf8 = opt.utf8;
800 sbi->s_nocompress = opt.nocompress;
801 /*
802 * It would be incredibly stupid to allow people to mark every file
803 * on the disk as suid, so we merely allow them to set the default
804 * permissions.

--- 652 unchanged lines hidden ---