From: Gao Xiang <hsiangkao@redhat.com>
To: Chengguang Xu <cgxu519@mykernel.net>
Cc: xiang@kernel.org, linux-erofs@lists.ozlabs.org
Subject: Re: [PATCH] erofs: code cleanup by removing ifdef macro surrounding
Date: Tue, 26 May 2020 17:49:41 +0800 [thread overview]
Message-ID: <20200526094939.GB8107@hsiangkao-HP-ZHAN-66-Pro-G1> (raw)
In-Reply-To: <20200526090343.22794-1-cgxu519@mykernel.net>
Hi Chengguang,
On Tue, May 26, 2020 at 05:03:43PM +0800, Chengguang Xu wrote:
> Define erofs_listxattr and erofs_xattr_handlers to NULL when
> CONFIG_EROFS_FS_XATTR is not enabled, then we can remove many
> ugly ifdef macros in the code.
>
> Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
> ---
> Only compile tested.
>
> fs/erofs/inode.c | 6 ------
> fs/erofs/namei.c | 2 --
> fs/erofs/super.c | 4 +---
> fs/erofs/xattr.h | 7 ++-----
> 4 files changed, 3 insertions(+), 16 deletions(-)
>
> diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
> index 3350ab65d892..7dd4bbe9674f 100644
> --- a/fs/erofs/inode.c
> +++ b/fs/erofs/inode.c
> @@ -311,27 +311,21 @@ int erofs_getattr(const struct path *path, struct kstat *stat,
>
> const struct inode_operations erofs_generic_iops = {
> .getattr = erofs_getattr,
> -#ifdef CONFIG_EROFS_FS_XATTR
> .listxattr = erofs_listxattr,
> -#endif
It seems equivalent. And it seems ext2 and f2fs behave in the same way...
But I'm not sure whether we'd return 0 (if I didn't see fs/xattr.c by mistake)
or -EOPNOTSUPP here... Some thoughts about this?
Anyway, I'm fine with that if return 0 is okay here, but I'd like to know your
and Chao's thoughts about this... I will play with it later as well.
Reviewed-by: Gao Xiang <hsiangkao@redhat.com>
Thanks,
Gao Xiang
> .get_acl = erofs_get_acl,
> };
>
> const struct inode_operations erofs_symlink_iops = {
> .get_link = page_get_link,
> .getattr = erofs_getattr,
> -#ifdef CONFIG_EROFS_FS_XATTR
> .listxattr = erofs_listxattr,
> -#endif
> .get_acl = erofs_get_acl,
> };
>
> const struct inode_operations erofs_fast_symlink_iops = {
> .get_link = simple_get_link,
> .getattr = erofs_getattr,
> -#ifdef CONFIG_EROFS_FS_XATTR
> .listxattr = erofs_listxattr,
> -#endif
> .get_acl = erofs_get_acl,
> };
>
> diff --git a/fs/erofs/namei.c b/fs/erofs/namei.c
> index 3abbecbf73de..52f201e03c62 100644
> --- a/fs/erofs/namei.c
> +++ b/fs/erofs/namei.c
> @@ -244,9 +244,7 @@ static struct dentry *erofs_lookup(struct inode *dir,
> const struct inode_operations erofs_dir_iops = {
> .lookup = erofs_lookup,
> .getattr = erofs_getattr,
> -#ifdef CONFIG_EROFS_FS_XATTR
> .listxattr = erofs_listxattr,
> -#endif
> .get_acl = erofs_get_acl,
> };
>
> diff --git a/fs/erofs/super.c b/fs/erofs/super.c
> index b514c67e5fc2..8e46d204a0c2 100644
> --- a/fs/erofs/super.c
> +++ b/fs/erofs/super.c
> @@ -408,10 +408,8 @@ static int erofs_fill_super(struct super_block *sb, void *data, int silent)
> sb->s_time_gran = 1;
>
> sb->s_op = &erofs_sops;
> -
> -#ifdef CONFIG_EROFS_FS_XATTR
> sb->s_xattr = erofs_xattr_handlers;
> -#endif
> +
> /* set erofs default mount options */
> erofs_default_options(sbi);
>
> diff --git a/fs/erofs/xattr.h b/fs/erofs/xattr.h
> index 50966f1c676e..e4e5093f012c 100644
> --- a/fs/erofs/xattr.h
> +++ b/fs/erofs/xattr.h
> @@ -76,11 +76,8 @@ static inline int erofs_getxattr(struct inode *inode, int index,
> return -EOPNOTSUPP;
> }
>
> -static inline ssize_t erofs_listxattr(struct dentry *dentry,
> - char *buffer, size_t buffer_size)
> -{
> - return -EOPNOTSUPP;
> -}
> +#define erofs_listxattr (NULL)
> +#define erofs_xattr_handlers (NULL)
> #endif /* !CONFIG_EROFS_FS_XATTR */
>
> #ifdef CONFIG_EROFS_FS_POSIX_ACL
> --
> 2.20.1
>
>
next prev parent reply other threads:[~2020-05-26 9:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 9:03 [PATCH] erofs: code cleanup by removing ifdef macro surrounding Chengguang Xu
2020-05-26 9:49 ` Gao Xiang [this message]
2020-05-26 10:29 ` cgxu
2020-05-26 10:35 ` Gao Xiang
2020-05-27 1:55 ` Chao Yu
2020-05-27 2:16 ` Gao Xiang
2020-05-27 2:24 ` cgxu
2020-05-27 2:35 ` Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200526094939.GB8107@hsiangkao-HP-ZHAN-66-Pro-G1 \
--to=hsiangkao@redhat.com \
--cc=cgxu519@mykernel.net \
--cc=linux-erofs@lists.ozlabs.org \
--cc=xiang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).