diff options
author | Fabian Frederick <fabf@skynet.be> | 2015-04-16 15:48:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 09:04:08 -0400 |
commit | 79bda4d510f80e403ef66fee852f8ccb17308581 (patch) | |
tree | 74c292beca04f1469623cdd7141c074c2ac5a67a /fs/affs/super.c | |
parent | 34f24835383092098cb4ce5c4eb6e719a9973d68 (diff) |
fs/affs: use affs_test_opt()
Replace mount option test by affs_test_opt().
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/affs/super.c')
-rw-r--r-- | fs/affs/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c index 32bfad4234f7..6819d0426af5 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c | |||
@@ -468,7 +468,7 @@ got_root: | |||
468 | return -EINVAL; | 468 | return -EINVAL; |
469 | } | 469 | } |
470 | 470 | ||
471 | if (mount_flags & AFFS_MOUNT_SF_VERBOSE) { | 471 | if (affs_test_opt(mount_flags, SF_VERBOSE)) { |
472 | u8 len = AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0]; | 472 | u8 len = AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0]; |
473 | pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n", | 473 | pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n", |
474 | len > 31 ? 31 : len, | 474 | len > 31 ? 31 : len, |
@@ -479,7 +479,7 @@ got_root: | |||
479 | sb->s_flags |= MS_NODEV | MS_NOSUID; | 479 | sb->s_flags |= MS_NODEV | MS_NOSUID; |
480 | 480 | ||
481 | sbi->s_data_blksize = sb->s_blocksize; | 481 | sbi->s_data_blksize = sb->s_blocksize; |
482 | if (sbi->s_flags & AFFS_MOUNT_SF_OFS) | 482 | if (affs_test_opt(sbi->s_flags, SF_OFS)) |
483 | sbi->s_data_blksize -= 24; | 483 | sbi->s_data_blksize -= 24; |
484 | 484 | ||
485 | tmp_flags = sb->s_flags; | 485 | tmp_flags = sb->s_flags; |
@@ -494,7 +494,7 @@ got_root: | |||
494 | if (IS_ERR(root_inode)) | 494 | if (IS_ERR(root_inode)) |
495 | return PTR_ERR(root_inode); | 495 | return PTR_ERR(root_inode); |
496 | 496 | ||
497 | if (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_INTL) | 497 | if (affs_test_opt(AFFS_SB(sb)->s_flags, SF_INTL)) |
498 | sb->s_d_op = &affs_intl_dentry_operations; | 498 | sb->s_d_op = &affs_intl_dentry_operations; |
499 | else | 499 | else |
500 | sb->s_d_op = &affs_dentry_operations; | 500 | sb->s_d_op = &affs_dentry_operations; |