Commit c7c707cb authored by Ferry Meng's avatar Ferry Meng Committed by Gao Xiang
Browse files

erofs: avoid some unnecessary #ifdefs 



They can either be removed or replaced with IS_ENABLED().

Signed-off-by: default avatarFerry Meng <mengferry@linux.alibaba.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent bc804a8d

fs/erofs/data.c

+8 −12
Original line number Diff line number Diff line
@@ -365,12 +365,10 @@ int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
		 u64 start, u64 len)

{

	if (erofs_inode_is_data_compressed(EROFS_I(inode)->datalayout)) {

#ifdef CONFIG_EROFS_FS_ZIP

		if (!IS_ENABLED(CONFIG_EROFS_FS_ZIP))

			return -EOPNOTSUPP;

		return iomap_fiemap(inode, fieinfo, start, len,

				    &z_erofs_iomap_report_ops);

#else

		return -EOPNOTSUPP;

#endif

	}

	return iomap_fiemap(inode, fieinfo, start, len, &erofs_iomap_ops);

}
@@ -428,10 +426,9 @@ static ssize_t erofs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 
	if (!iov_iter_count(to))

		return 0;



#ifdef CONFIG_FS_DAX

	if (IS_DAX(inode))

	if (IS_ENABLED(CONFIG_FS_DAX) && IS_DAX(inode))

		return dax_iomap_rw(iocb, to, &erofs_iomap_ops);

#endif



	if ((iocb->ki_flags & IOCB_DIRECT) && inode->i_sb->s_bdev) {

		struct erofs_iomap_iter_ctx iter_ctx = {

			.realinode = inode,
@@ -491,12 +488,11 @@ static loff_t erofs_file_llseek(struct file *file, loff_t offset, int whence) 
	struct inode *inode = file->f_mapping->host;

	const struct iomap_ops *ops = &erofs_iomap_ops;



	if (erofs_inode_is_data_compressed(EROFS_I(inode)->datalayout))

#ifdef CONFIG_EROFS_FS_ZIP

		ops = &z_erofs_iomap_report_ops;

#else

	if (erofs_inode_is_data_compressed(EROFS_I(inode)->datalayout)) {

		if (!IS_ENABLED(CONFIG_EROFS_FS_ZIP))

			return generic_file_llseek(file, offset, whence);

#endif

		ops = &z_erofs_iomap_report_ops;

	}



	if (whence == SEEK_HOLE)

		offset = iomap_seek_hole(inode, offset, ops);

fs/erofs/super.c

+4 −9
Original line number Diff line number Diff line
@@ -381,12 +381,10 @@ static void erofs_default_options(struct erofs_sb_info *sbi) 
	sbi->opt.cache_strategy = EROFS_ZIP_CACHE_READAROUND;

	sbi->sync_decompress = EROFS_SYNC_DECOMPRESS_AUTO;

#endif

#ifdef CONFIG_EROFS_FS_XATTR

	if (IS_ENABLED(CONFIG_EROFS_FS_XATTR))

		set_opt(&sbi->opt, XATTR_USER);

#endif

#ifdef CONFIG_EROFS_FS_POSIX_ACL

	if (IS_ENABLED(CONFIG_EROFS_FS_POSIX_ACL))

		set_opt(&sbi->opt, POSIX_ACL);

#endif

}



enum {
@@ -1125,11 +1123,8 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root) 


static void erofs_evict_inode(struct inode *inode)

{

#ifdef CONFIG_FS_DAX

	if (IS_DAX(inode))

		dax_break_layout_final(inode);

#endif



	erofs_ishare_free_inode(inode);

	truncate_inode_pages_final(&inode->i_data);

	clear_inode(inode);

fs/erofs/sysfs.c

+2 −3
Original line number Diff line number Diff line
@@ -168,11 +168,10 @@ static ssize_t erofs_attr_store(struct kobject *kobj, struct attribute *attr, 
			return ret;

		if (t != (unsigned int)t)

			return -ERANGE;

#ifdef CONFIG_EROFS_FS_ZIP

		if (!strcmp(a->attr.name, "sync_decompress") &&

		if (IS_ENABLED(CONFIG_EROFS_FS_ZIP) &&

		    !strcmp(a->attr.name, "sync_decompress") &&

		    (t > EROFS_SYNC_DECOMPRESS_FORCE_OFF))

			return -EINVAL;

#endif

		*(unsigned int *)ptr = t;

		return len;

	case attr_pointer_bool: