fs/affs: use affs_test_opt() (79bda4d5) · Commits · EulixOS / Software / Kernel

fs/affs/amigaffs.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -472,7 +472,8 @@ bool
	affs_nofilenametruncate(const struct dentry *dentry)		affs_nofilenametruncate(const struct dentry *dentry)
	{		{
	struct inode *inode = dentry->d_inode;		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);

	}		}

fs/affs/file.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -915,7 +915,7 @@ affs_truncate(struct inode *inode)
	if (inode->i_size) {		if (inode->i_size) {
	AFFS_I(inode)->i_blkcnt = last_blk + 1;		AFFS_I(inode)->i_blkcnt = last_blk + 1;
	AFFS_I(inode)->i_extcnt = ext + 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);		struct buffer_head *bh = affs_bread_ino(inode, last_blk, 0);
	u32 tmp;		u32 tmp;
	if (IS_ERR(bh)) {		if (IS_ERR(bh)) {

fs/affs/inode.c

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -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_lastalloc = 0;
	AFFS_I(inode)->i_pa_cnt = 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;		inode->i_mode = sbi->s_mode;
	else		else
	inode->i_mode = prot_to_mode(prot);		inode->i_mode = prot_to_mode(prot);

	id = be16_to_cpu(tail->uid);		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;		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);		i_uid_write(inode, 0);
	else		else
	i_uid_write(inode, id);		i_uid_write(inode, id);

	id = be16_to_cpu(tail->gid);		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;		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);		i_gid_write(inode, 0);
	else		else
	i_gid_write(inode, id);		i_gid_write(inode, id);
	@@ -94,7 +94,7 @@ struct inode affs_iget(struct super_block sb, unsigned long ino)
	/* fall through */		/* fall through */
	case ST_USERDIR:		case ST_USERDIR:
	if (be32_to_cpu(tail->stype) == 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)		if (inode->i_mode & S_IRUSR)
	inode->i_mode \|= S_IXUSR;		inode->i_mode \|= S_IXUSR;
	if (inode->i_mode & S_IRGRP)		if (inode->i_mode & S_IRGRP)
	@@ -133,7 +133,7 @@ struct inode affs_iget(struct super_block sb, unsigned long ino)
	}		}
	if (tail->link_chain)		if (tail->link_chain)
	set_nlink(inode, 2);		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;		&affs_aops_ofs : &affs_aops;
	inode->i_op = &affs_file_inode_operations;		inode->i_op = &affs_file_inode_operations;
	inode->i_fop = &affs_file_operations;		inode->i_fop = &affs_file_operations;
	@@ -191,15 +191,15 @@ affs_write_inode(struct inode inode, struct writeback_control wbc)
	if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {		if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {
	uid = i_uid_read(inode);		uid = i_uid_read(inode);
	gid = i_gid_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)		if (uid == 0 \|\| uid == 0xFFFF)
	uid = uid ^ ~0;		uid = uid ^ ~0;
	if (gid == 0 \|\| gid == 0xFFFF)		if (gid == 0 \|\| gid == 0xFFFF)
	gid = gid ^ ~0;		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);		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);		tail->gid = cpu_to_be16(gid);
	}		}
	}		}
	@@ -223,13 +223,13 @@ affs_notify_change(struct dentry dentry, struct iattr attr)
	goto out;		goto out;

	if (((attr->ia_valid & ATTR_UID) &&		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) &&		((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) &&		((attr->ia_valid & ATTR_MODE) &&
	(AFFS_SB(inode->i_sb)->s_flags &		(AFFS_SB(inode->i_sb)->s_flags &
	(AFFS_MOUNT_SF_SETMODE \| AFFS_MOUNT_SF_IMMUTABLE)))) {		(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;		error = -EPERM;
	goto out;		goto out;
	}		}

fs/affs/namei.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ affs_intl_toupper(int ch)
	static inline toupper_t		static inline toupper_t
	affs_get_toupper(struct super_block *sb)		affs_get_toupper(struct super_block *sb)
	{		{
	return AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_INTL ?		return affs_test_opt(AFFS_SB(sb)->s_flags, SF_INTL) ?
	affs_intl_toupper : affs_toupper;		affs_intl_toupper : affs_toupper;
	}		}

	@@ -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_op = &affs_file_inode_operations;
	inode->i_fop = &affs_file_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;		&affs_aops_ofs : &affs_aops;
	error = affs_add_entry(dir, inode, dentry, ST_FILE);		error = affs_add_entry(dir, inode, dentry, ST_FILE);
	if (error) {		if (error) {

fs/affs/super.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -468,7 +468,7 @@ static int affs_fill_super(struct super_block sb, void data, int silent)
	return -EINVAL;		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];		u8 len = AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0];
	pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",		pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",
	len > 31 ? 31 : len,		len > 31 ? 31 : len,
	@@ -479,7 +479,7 @@ static int affs_fill_super(struct super_block sb, void data, int silent)
	sb->s_flags \|= MS_NODEV \| MS_NOSUID;		sb->s_flags \|= MS_NODEV \| MS_NOSUID;

	sbi->s_data_blksize = sb->s_blocksize;		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;		sbi->s_data_blksize -= 24;

	tmp_flags = sb->s_flags;		tmp_flags = sb->s_flags;
	@@ -494,7 +494,7 @@ static int affs_fill_super(struct super_block sb, void data, int silent)
	if (IS_ERR(root_inode))		if (IS_ERR(root_inode))
	return PTR_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;		sb->s_d_op = &affs_intl_dentry_operations;
	else		else
	sb->s_d_op = &affs_dentry_operations;		sb->s_d_op = &affs_dentry_operations;