Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

udf: Remove never implemented mount options

Signed-off-by: Jan Kara <jack@suse.cz>

Jan Kara f0c4a817 6ccd5194

+1 -35
-8
Documentation/filesystems/udf.txt
··· 53 53 54 54 session= Set the CDROM session (default= last session) 55 55 anchor= Override standard anchor location. (default= 256) 56 - volume= Override the VolumeDesc location. (unused) 57 - partition= Override the PartitionDesc location. (unused) 58 56 lastblock= Set the last block of the filesystem/ 59 57 60 - The following expect a offset from the partition root. 61 - 62 - fileset= Override the fileset block location. (unused) 63 - rootdir= Override the root directory location. (unused) 64 - WARNING: overriding the rootdir to a non-directory may 65 - yield highly unpredictable results. 66 58 ------------------------------------------------------------------------------- 67 59 68 60
+1 -27
fs/udf/super.c
··· 222 222 unsigned int session; 223 223 unsigned int lastblock; 224 224 unsigned int anchor; 225 - unsigned int volume; 226 - unsigned short partition; 227 - unsigned int fileset; 228 - unsigned int rootdir; 229 225 unsigned int flags; 230 226 umode_t umask; 231 227 kgid_t gid; ··· 362 366 seq_printf(seq, ",lastblock=%u", sbi->s_last_block); 363 367 if (sbi->s_anchor != 0) 364 368 seq_printf(seq, ",anchor=%u", sbi->s_anchor); 365 - /* 366 - * volume, partition, fileset and rootdir seem to be ignored 367 - * currently 368 - */ 369 369 if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) 370 370 seq_puts(seq, ",utf8"); 371 371 if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP) && sbi->s_nls_map) ··· 474 482 int option; 475 483 476 484 uopt->novrs = 0; 477 - uopt->partition = 0xFFFF; 478 485 uopt->session = 0xFFFFFFFF; 479 486 uopt->lastblock = 0; 480 487 uopt->anchor = 0; 481 - uopt->volume = 0xFFFFFFFF; 482 - uopt->rootdir = 0xFFFFFFFF; 483 - uopt->fileset = 0xFFFFFFFF; 484 488 uopt->nls_map = NULL; 485 489 486 490 if (!options) ··· 565 577 uopt->anchor = option; 566 578 break; 567 579 case Opt_volume: 568 - if (match_int(args, &option)) 569 - return 0; 570 - uopt->volume = option; 571 - break; 572 580 case Opt_partition: 573 - if (match_int(args, &option)) 574 - return 0; 575 - uopt->partition = option; 576 - break; 577 581 case Opt_fileset: 578 - if (match_int(args, &option)) 579 - return 0; 580 - uopt->fileset = option; 581 - break; 582 582 case Opt_rootdir: 583 - if (match_int(args, &option)) 584 - return 0; 585 - uopt->rootdir = option; 583 + /* Ignored (never implemented properly) */ 586 584 break; 587 585 case Opt_utf8: 588 586 uopt->flags |= (1 << UDF_FLAG_UTF8);