Skip to content

Commit

Permalink
fs/affs: use affs_test_opt()
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Fabian Frederick authored and Linus Torvalds committed Apr 17, 2015
1 parent 34f2483 commit 79bda4d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 21 deletions.
3 changes: 2 additions & 1 deletion fs/affs/amigaffs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,8 @@ bool
affs_nofilenametruncate(const struct dentry *dentry)
{
struct inode *inode = dentry->d_inode;
return AFFS_SB(inode->i_sb)->s_flags & AFFS_MOUNT_SF_NO_TRUNCATE;

return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE);

}

Expand Down
2 changes: 1 addition & 1 deletion fs/affs/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ affs_truncate(struct inode *inode)
if (inode->i_size) {
AFFS_I(inode)->i_blkcnt = last_blk + 1;
AFFS_I(inode)->i_extcnt = ext + 1;
if (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_OFS) {
if (affs_test_opt(AFFS_SB(sb)->s_flags, SF_OFS)) {
struct buffer_head *bh = affs_bread_ino(inode, last_blk, 0);
u32 tmp;
if (IS_ERR(bh)) {
Expand Down
26 changes: 13 additions & 13 deletions fs/affs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,23 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
AFFS_I(inode)->i_lastalloc = 0;
AFFS_I(inode)->i_pa_cnt = 0;

if (sbi->s_flags & AFFS_MOUNT_SF_SETMODE)
if (affs_test_opt(sbi->s_flags, SF_SETMODE))
inode->i_mode = sbi->s_mode;
else
inode->i_mode = prot_to_mode(prot);

id = be16_to_cpu(tail->uid);
if (id == 0 || sbi->s_flags & AFFS_MOUNT_SF_SETUID)
if (id == 0 || affs_test_opt(sbi->s_flags, SF_SETUID))
inode->i_uid = sbi->s_uid;
else if (id == 0xFFFF && sbi->s_flags & AFFS_MOUNT_SF_MUFS)
else if (id == 0xFFFF && affs_test_opt(sbi->s_flags, SF_MUFS))
i_uid_write(inode, 0);
else
i_uid_write(inode, id);

id = be16_to_cpu(tail->gid);
if (id == 0 || sbi->s_flags & AFFS_MOUNT_SF_SETGID)
if (id == 0 || affs_test_opt(sbi->s_flags, SF_SETGID))
inode->i_gid = sbi->s_gid;
else if (id == 0xFFFF && sbi->s_flags & AFFS_MOUNT_SF_MUFS)
else if (id == 0xFFFF && affs_test_opt(sbi->s_flags, SF_MUFS))
i_gid_write(inode, 0);
else
i_gid_write(inode, id);
Expand All @@ -94,7 +94,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
/* fall through */
case ST_USERDIR:
if (be32_to_cpu(tail->stype) == ST_USERDIR ||
sbi->s_flags & AFFS_MOUNT_SF_SETMODE) {
affs_test_opt(sbi->s_flags, SF_SETMODE)) {
if (inode->i_mode & S_IRUSR)
inode->i_mode |= S_IXUSR;
if (inode->i_mode & S_IRGRP)
Expand Down Expand Up @@ -133,7 +133,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
}
if (tail->link_chain)
set_nlink(inode, 2);
inode->i_mapping->a_ops = (sbi->s_flags & AFFS_MOUNT_SF_OFS) ?
inode->i_mapping->a_ops = affs_test_opt(sbi->s_flags, SF_OFS) ?
&affs_aops_ofs : &affs_aops;
inode->i_op = &affs_file_inode_operations;
inode->i_fop = &affs_file_operations;
Expand Down Expand Up @@ -191,15 +191,15 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {
uid = i_uid_read(inode);
gid = i_gid_read(inode);
if (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_MUFS) {
if (affs_test_opt(AFFS_SB(sb)->s_flags, SF_MUFS)) {
if (uid == 0 || uid == 0xFFFF)
uid = uid ^ ~0;
if (gid == 0 || gid == 0xFFFF)
gid = gid ^ ~0;
}
if (!(AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_SETUID))
if (!affs_test_opt(AFFS_SB(sb)->s_flags, SF_SETUID))
tail->uid = cpu_to_be16(uid);
if (!(AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_SETGID))
if (!affs_test_opt(AFFS_SB(sb)->s_flags, SF_SETGID))
tail->gid = cpu_to_be16(gid);
}
}
Expand All @@ -223,13 +223,13 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr)
goto out;

if (((attr->ia_valid & ATTR_UID) &&
(AFFS_SB(inode->i_sb)->s_flags & AFFS_MOUNT_SF_SETUID)) ||
affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_SETUID)) ||
((attr->ia_valid & ATTR_GID) &&
(AFFS_SB(inode->i_sb)->s_flags & AFFS_MOUNT_SF_SETGID)) ||
affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_SETGID)) ||
((attr->ia_valid & ATTR_MODE) &&
(AFFS_SB(inode->i_sb)->s_flags &
(AFFS_MOUNT_SF_SETMODE | AFFS_MOUNT_SF_IMMUTABLE)))) {
if (!(AFFS_SB(inode->i_sb)->s_flags & AFFS_MOUNT_SF_QUIET))
if (!affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_QUIET))
error = -EPERM;
goto out;
}
Expand Down
6 changes: 3 additions & 3 deletions fs/affs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ affs_intl_toupper(int ch)
static inline toupper_t
affs_get_toupper(struct super_block *sb)
{
return AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_INTL ?
affs_intl_toupper : affs_toupper;
return affs_test_opt(AFFS_SB(sb)->s_flags, SF_INTL) ?
affs_intl_toupper : affs_toupper;
}

/*
Expand Down Expand Up @@ -276,7 +276,7 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl)

inode->i_op = &affs_file_inode_operations;
inode->i_fop = &affs_file_operations;
inode->i_mapping->a_ops = (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_OFS) ?
inode->i_mapping->a_ops = affs_test_opt(AFFS_SB(sb)->s_flags, SF_OFS) ?
&affs_aops_ofs : &affs_aops;
error = affs_add_entry(dir, inode, dentry, ST_FILE);
if (error) {
Expand Down
6 changes: 3 additions & 3 deletions fs/affs/super.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
return -EINVAL;
}

if (mount_flags & AFFS_MOUNT_SF_VERBOSE) {
if (affs_test_opt(mount_flags, SF_VERBOSE)) {
u8 len = AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0];
pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",
len > 31 ? 31 : len,
Expand All @@ -479,7 +479,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_flags |= MS_NODEV | MS_NOSUID;

sbi->s_data_blksize = sb->s_blocksize;
if (sbi->s_flags & AFFS_MOUNT_SF_OFS)
if (affs_test_opt(sbi->s_flags, SF_OFS))
sbi->s_data_blksize -= 24;

tmp_flags = sb->s_flags;
Expand All @@ -494,7 +494,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
if (IS_ERR(root_inode))
return PTR_ERR(root_inode);

if (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_INTL)
if (affs_test_opt(AFFS_SB(sb)->s_flags, SF_INTL))
sb->s_d_op = &affs_intl_dentry_operations;
else
sb->s_d_op = &affs_dentry_operations;
Expand Down

0 comments on commit 79bda4d

Please sign in to comment.