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

ufs: split ->s_mount_opt - don't mix flavour and on-error

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro f8e77914 82f2b0b9

+42 -62
+40 -55
fs/ufs/super.c
··· 289 289 va_start(args, fmt); 290 290 vaf.fmt = fmt; 291 291 vaf.va = &args; 292 - switch (UFS_SB(sb)->s_mount_opt & UFS_MOUNT_ONERROR) { 292 + switch (UFS_SB(sb)->s_on_err) { 293 293 case UFS_MOUNT_ONERROR_PANIC: 294 294 panic("panic (device %s): %s: %pV\n", 295 295 sb->s_id, function, &vaf); ··· 380 380 {Opt_err, NULL} 381 381 }; 382 382 383 - static int ufs_parse_options (char * options, unsigned * mount_options) 383 + static int ufs_parse_options(char *options, unsigned *flavour, unsigned *on_err) 384 384 { 385 385 char * p; 386 386 ··· 398 398 token = match_token(p, tokens, args); 399 399 switch (token) { 400 400 case Opt_type_old: 401 - ufs_clear_opt (*mount_options, UFSTYPE); 402 - ufs_set_opt (*mount_options, UFSTYPE_OLD); 401 + *flavour = UFS_MOUNT_UFSTYPE_OLD; 403 402 break; 404 403 case Opt_type_sunx86: 405 - ufs_clear_opt (*mount_options, UFSTYPE); 406 - ufs_set_opt (*mount_options, UFSTYPE_SUNx86); 404 + *flavour = UFS_MOUNT_UFSTYPE_SUNx86; 407 405 break; 408 406 case Opt_type_sun: 409 - ufs_clear_opt (*mount_options, UFSTYPE); 410 - ufs_set_opt (*mount_options, UFSTYPE_SUN); 407 + *flavour = UFS_MOUNT_UFSTYPE_SUN; 411 408 break; 412 409 case Opt_type_sunos: 413 - ufs_clear_opt(*mount_options, UFSTYPE); 414 - ufs_set_opt(*mount_options, UFSTYPE_SUNOS); 410 + *flavour = UFS_MOUNT_UFSTYPE_SUNOS; 415 411 break; 416 412 case Opt_type_44bsd: 417 - ufs_clear_opt (*mount_options, UFSTYPE); 418 - ufs_set_opt (*mount_options, UFSTYPE_44BSD); 413 + *flavour = UFS_MOUNT_UFSTYPE_44BSD; 419 414 break; 420 415 case Opt_type_ufs2: 421 - ufs_clear_opt(*mount_options, UFSTYPE); 422 - ufs_set_opt(*mount_options, UFSTYPE_UFS2); 416 + *flavour = UFS_MOUNT_UFSTYPE_UFS2; 423 417 break; 424 418 case Opt_type_hp: 425 - ufs_clear_opt (*mount_options, UFSTYPE); 426 - ufs_set_opt (*mount_options, UFSTYPE_HP); 419 + *flavour = UFS_MOUNT_UFSTYPE_HP; 427 420 break; 428 421 case Opt_type_nextstepcd: 429 - ufs_clear_opt (*mount_options, UFSTYPE); 430 - ufs_set_opt (*mount_options, UFSTYPE_NEXTSTEP_CD); 422 + *flavour = UFS_MOUNT_UFSTYPE_NEXTSTEP_CD; 431 423 break; 432 424 case Opt_type_nextstep: 433 - ufs_clear_opt (*mount_options, UFSTYPE); 434 - ufs_set_opt (*mount_options, UFSTYPE_NEXTSTEP); 425 + *flavour = UFS_MOUNT_UFSTYPE_NEXTSTEP; 435 426 break; 436 427 case Opt_type_openstep: 437 - ufs_clear_opt (*mount_options, UFSTYPE); 438 - ufs_set_opt (*mount_options, UFSTYPE_OPENSTEP); 428 + *flavour = UFS_MOUNT_UFSTYPE_OPENSTEP; 439 429 break; 440 430 case Opt_onerror_panic: 441 - ufs_clear_opt (*mount_options, ONERROR); 442 - ufs_set_opt (*mount_options, ONERROR_PANIC); 431 + *on_err = UFS_MOUNT_ONERROR_PANIC; 443 432 break; 444 433 case Opt_onerror_lock: 445 - ufs_clear_opt (*mount_options, ONERROR); 446 - ufs_set_opt (*mount_options, ONERROR_LOCK); 434 + *on_err = UFS_MOUNT_ONERROR_LOCK; 447 435 break; 448 436 case Opt_onerror_umount: 449 - ufs_clear_opt (*mount_options, ONERROR); 450 - ufs_set_opt (*mount_options, ONERROR_UMOUNT); 437 + *on_err = UFS_MOUNT_ONERROR_UMOUNT; 451 438 break; 452 439 case Opt_onerror_repair: 440 + *on_err = UFS_MOUNT_ONERROR_REPAIR; 453 441 pr_err("Unable to do repair on error, will lock lock instead\n"); 454 - ufs_clear_opt (*mount_options, ONERROR); 455 - ufs_set_opt (*mount_options, ONERROR_REPAIR); 456 442 break; 457 443 default: 458 444 pr_err("Invalid option: \"%s\" or missing value\n", p); ··· 460 474 struct ufs_super_block_first *usb1; 461 475 struct ufs_super_block_second *usb2; 462 476 struct ufs_super_block_third *usb3; 463 - unsigned mtype = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE; 477 + unsigned mtype = sbi->s_flavour; 464 478 465 479 UFSD("ENTER, mtype=%u\n", mtype); 466 480 usb1 = ubh_get_usb_first(uspi); ··· 566 580 */ 567 581 static void ufs_put_cstotal(struct super_block *sb) 568 582 { 569 - unsigned mtype = UFS_SB(sb)->s_mount_opt & UFS_MOUNT_UFSTYPE; 583 + unsigned mtype = UFS_SB(sb)->s_flavour; 570 584 struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; 571 585 struct ufs_super_block_first *usb1; 572 586 struct ufs_super_block_second *usb2; ··· 793 807 * Set default mount options 794 808 * Parse mount options 795 809 */ 796 - sbi->s_mount_opt = 0; 797 - ufs_set_opt (sbi->s_mount_opt, ONERROR_LOCK); 798 - if (!ufs_parse_options ((char *) data, &sbi->s_mount_opt)) { 810 + sbi->s_flavour = 0; 811 + sbi->s_on_err = UFS_MOUNT_ONERROR_LOCK; 812 + if (!ufs_parse_options(data, &sbi->s_flavour, &sbi->s_on_err)) { 799 813 pr_err("wrong mount options\n"); 800 814 goto failed; 801 815 } 802 - if (!(sbi->s_mount_opt & UFS_MOUNT_UFSTYPE)) { 816 + if (!sbi->s_flavour) { 803 817 if (!silent) 804 818 pr_err("You didn't specify the type of your ufs filesystem\n\n" 805 819 "mount -t ufs -o ufstype=" 806 820 "sun|sunx86|44bsd|ufs2|5xbsd|old|hp|nextstep|nextstep-cd|openstep ...\n\n" 807 821 ">>>WARNING<<< Wrong ufstype may corrupt your filesystem, " 808 822 "default is ufstype=old\n"); 809 - ufs_set_opt (sbi->s_mount_opt, UFSTYPE_OLD); 823 + sbi->s_flavour = UFS_MOUNT_UFSTYPE_OLD; 810 824 } 811 825 812 826 uspi = kzalloc(sizeof(struct ufs_sb_private_info), GFP_KERNEL); ··· 822 836 sb->s_time_min = S32_MIN; 823 837 sb->s_time_max = S32_MAX; 824 838 825 - switch (sbi->s_mount_opt & UFS_MOUNT_UFSTYPE) { 839 + switch (sbi->s_flavour) { 826 840 case UFS_MOUNT_UFSTYPE_44BSD: 827 841 UFSD("ufstype=44bsd\n"); 828 842 uspi->s_fsize = block_size = 512; ··· 1021 1035 goto magic_found; 1022 1036 } 1023 1037 1024 - if ((((sbi->s_mount_opt & UFS_MOUNT_UFSTYPE) == UFS_MOUNT_UFSTYPE_NEXTSTEP) 1025 - || ((sbi->s_mount_opt & UFS_MOUNT_UFSTYPE) == UFS_MOUNT_UFSTYPE_NEXTSTEP_CD) 1026 - || ((sbi->s_mount_opt & UFS_MOUNT_UFSTYPE) == UFS_MOUNT_UFSTYPE_OPENSTEP)) 1038 + if ((sbi->s_flavour == UFS_MOUNT_UFSTYPE_NEXTSTEP 1039 + || sbi->s_flavour == UFS_MOUNT_UFSTYPE_NEXTSTEP_CD 1040 + || sbi->s_flavour == UFS_MOUNT_UFSTYPE_OPENSTEP) 1027 1041 && uspi->s_sbbase < 256) { 1028 1042 ubh_brelse_uspi(uspi); 1029 1043 ubh = NULL; ··· 1223 1237 uspi->s_bpf = uspi->s_fsize << 3; 1224 1238 uspi->s_bpfshift = uspi->s_fshift + 3; 1225 1239 uspi->s_bpfmask = uspi->s_bpf - 1; 1226 - if ((sbi->s_mount_opt & UFS_MOUNT_UFSTYPE) == UFS_MOUNT_UFSTYPE_44BSD || 1227 - (sbi->s_mount_opt & UFS_MOUNT_UFSTYPE) == UFS_MOUNT_UFSTYPE_UFS2) 1240 + if (sbi->s_flavour == UFS_MOUNT_UFSTYPE_44BSD || 1241 + sbi->s_flavour == UFS_MOUNT_UFSTYPE_UFS2) 1228 1242 uspi->s_maxsymlinklen = 1229 1243 fs32_to_cpu(sb, usb3->fs_un2.fs_44.fs_maxsymlinklen); 1230 1244 ··· 1281 1295 struct ufs_sb_private_info * uspi; 1282 1296 struct ufs_super_block_first * usb1; 1283 1297 struct ufs_super_block_third * usb3; 1284 - unsigned new_mount_opt, ufstype; 1298 + unsigned on_err, ufstype; 1285 1299 unsigned flags; 1286 1300 1287 1301 sync_filesystem(sb); ··· 1295 1309 * Allow the "check" option to be passed as a remount option. 1296 1310 * It is not possible to change ufstype option during remount 1297 1311 */ 1298 - ufstype = UFS_SB(sb)->s_mount_opt & UFS_MOUNT_UFSTYPE; 1299 - new_mount_opt = 0; 1300 - ufs_set_opt (new_mount_opt, ONERROR_LOCK); 1301 - if (!ufs_parse_options (data, &new_mount_opt)) { 1312 + ufstype = 0; 1313 + on_err = UFS_MOUNT_ONERROR_LOCK; 1314 + if (!ufs_parse_options(data, &ufstype, &on_err)) { 1302 1315 mutex_unlock(&UFS_SB(sb)->s_lock); 1303 1316 return -EINVAL; 1304 1317 } 1305 - if (!(new_mount_opt & UFS_MOUNT_UFSTYPE)) { 1306 - new_mount_opt |= ufstype; 1307 - } else if ((new_mount_opt & UFS_MOUNT_UFSTYPE) != ufstype) { 1318 + if (!ufstype) 1319 + ufstype = UFS_SB(sb)->s_flavour; 1320 + else if (ufstype != UFS_SB(sb)->s_flavour) { 1308 1321 pr_err("ufstype can't be changed during remount\n"); 1309 1322 mutex_unlock(&UFS_SB(sb)->s_lock); 1310 1323 return -EINVAL; 1311 1324 } 1312 1325 1313 1326 if ((bool)(*mount_flags & SB_RDONLY) == sb_rdonly(sb)) { 1314 - UFS_SB(sb)->s_mount_opt = new_mount_opt; 1327 + UFS_SB(sb)->s_on_err = on_err; 1315 1328 mutex_unlock(&UFS_SB(sb)->s_lock); 1316 1329 return 0; 1317 1330 } ··· 1354 1369 sb->s_flags &= ~SB_RDONLY; 1355 1370 #endif 1356 1371 } 1357 - UFS_SB(sb)->s_mount_opt = new_mount_opt; 1372 + UFS_SB(sb)->s_on_err = on_err; 1358 1373 mutex_unlock(&UFS_SB(sb)->s_lock); 1359 1374 return 0; 1360 1375 } ··· 1362 1377 static int ufs_show_options(struct seq_file *seq, struct dentry *root) 1363 1378 { 1364 1379 struct ufs_sb_info *sbi = UFS_SB(root->d_sb); 1365 - unsigned mval = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE; 1380 + unsigned mval = sbi->s_flavour; 1366 1381 const struct match_token *tp = tokens; 1367 1382 1368 1383 while (tp->token != Opt_onerror_panic && tp->token != mval) ··· 1370 1385 BUG_ON(tp->token == Opt_onerror_panic); 1371 1386 seq_printf(seq, ",%s", tp->pattern); 1372 1387 1373 - mval = sbi->s_mount_opt & UFS_MOUNT_ONERROR; 1388 + mval = sbi->s_on_err; 1374 1389 while (tp->token != Opt_err && tp->token != mval) 1375 1390 ++tp; 1376 1391 BUG_ON(tp->token == Opt_err);
+2 -7
fs/ufs/ufs.h
··· 24 24 struct ufs_cg_private_info * s_ucpi[UFS_MAX_GROUP_LOADED]; 25 25 unsigned s_cgno[UFS_MAX_GROUP_LOADED]; 26 26 unsigned short s_cg_loaded; 27 - unsigned s_mount_opt; 27 + unsigned s_flavour; 28 + unsigned s_on_err; 28 29 struct super_block *sb; 29 30 int work_queued; /* non-zero if the delayed work is queued */ 30 31 struct delayed_work sync_work; /* FS sync delayed work */ ··· 53 52 }; 54 53 55 54 /* mount options */ 56 - #define UFS_MOUNT_ONERROR 0x0000000F 57 55 #define UFS_MOUNT_ONERROR_PANIC 0x00000001 58 56 #define UFS_MOUNT_ONERROR_LOCK 0x00000002 59 57 #define UFS_MOUNT_ONERROR_UMOUNT 0x00000004 60 58 #define UFS_MOUNT_ONERROR_REPAIR 0x00000008 61 59 62 - #define UFS_MOUNT_UFSTYPE 0x0000FFF0 63 60 #define UFS_MOUNT_UFSTYPE_OLD 0x00000010 64 61 #define UFS_MOUNT_UFSTYPE_44BSD 0x00000020 65 62 #define UFS_MOUNT_UFSTYPE_SUN 0x00000040 ··· 68 69 #define UFS_MOUNT_UFSTYPE_HP 0x00000800 69 70 #define UFS_MOUNT_UFSTYPE_UFS2 0x00001000 70 71 #define UFS_MOUNT_UFSTYPE_SUNOS 0x00002000 71 - 72 - #define ufs_clear_opt(o,opt) o &= ~UFS_MOUNT_##opt 73 - #define ufs_set_opt(o,opt) o |= UFS_MOUNT_##opt 74 - #define ufs_test_opt(o,opt) ((o) & UFS_MOUNT_##opt) 75 72 76 73 /* 77 74 * Debug code