* [PATCH] overlayfs: improve ovl_get_acl
@ 2022-07-15 11:06 Yang Xu
2022-07-27 13:33 ` Miklos Szeredi
0 siblings, 1 reply; 3+ messages in thread
From: Yang Xu @ 2022-07-15 11:06 UTC (permalink / raw)
To: linux-unionfs; +Cc: miklos, brauner, xuyang2018.jy
Provide a proper stub for the !CONFIG_FS_POSIX_ACL case.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
fs/overlayfs/inode.c | 2 +-
fs/overlayfs/overlayfs.h | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 492eddeb481f..ba2dde24c1f7 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -460,7 +460,7 @@ struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu)
const struct cred *old_cred;
struct posix_acl *acl;
- if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode))
+ if (!IS_POSIXACL(realinode))
return NULL;
if (rcu)
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 4f34b7e02eee..3d8de16a76e9 100644
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -599,7 +599,13 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name,
int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name,
void *value, size_t size);
ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
+
+#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu);
+#else
+#define ovl_get_acl NULL
+#endif
+
int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags);
bool ovl_is_private_xattr(struct super_block *sb, const char *name);
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] overlayfs: improve ovl_get_acl
2022-07-15 11:06 [PATCH] overlayfs: improve ovl_get_acl Yang Xu
@ 2022-07-27 13:33 ` Miklos Szeredi
2022-07-28 1:50 ` xuyang2018.jy
0 siblings, 1 reply; 3+ messages in thread
From: Miklos Szeredi @ 2022-07-27 13:33 UTC (permalink / raw)
To: Yang Xu; +Cc: overlayfs, Christian Brauner
On Fri, 15 Jul 2022 at 12:06, Yang Xu <xuyang2018.jy@fujitsu.com> wrote:
>
> Provide a proper stub for the !CONFIG_FS_POSIX_ACL case.
>
> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
> ---
> fs/overlayfs/inode.c | 2 +-
> fs/overlayfs/overlayfs.h | 6 ++++++
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
> index 492eddeb481f..ba2dde24c1f7 100644
> --- a/fs/overlayfs/inode.c
> +++ b/fs/overlayfs/inode.c
> @@ -460,7 +460,7 @@ struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu)
> const struct cred *old_cred;
> struct posix_acl *acl;
>
> - if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode))
> + if (!IS_POSIXACL(realinode))
> return NULL;
>
> if (rcu)
> diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
> index 4f34b7e02eee..3d8de16a76e9 100644
> --- a/fs/overlayfs/overlayfs.h
> +++ b/fs/overlayfs/overlayfs.h
> @@ -599,7 +599,13 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name,
> int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name,
> void *value, size_t size);
> ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
> +
> +#ifdef CONFIG_FS_POSIX_ACL
> struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu);
> +#else
> +#define ovl_get_acl NULL
> +#endif
> +
Shouldn't ovl_get_acl() definition also be wrapped in #ifdef
CONFIG_FS_POSIX_ACL?
Thanks,
Miklos
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] overlayfs: improve ovl_get_acl
2022-07-27 13:33 ` Miklos Szeredi
@ 2022-07-28 1:50 ` xuyang2018.jy
0 siblings, 0 replies; 3+ messages in thread
From: xuyang2018.jy @ 2022-07-28 1:50 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: overlayfs, Christian Brauner
on 2022/07/27 21:33, Miklos Szeredi wrote:
> On Fri, 15 Jul 2022 at 12:06, Yang Xu <xuyang2018.jy@fujitsu.com> wrote:
>>
>> Provide a proper stub for the !CONFIG_FS_POSIX_ACL case.
>>
>> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
>> ---
>> fs/overlayfs/inode.c | 2 +-
>> fs/overlayfs/overlayfs.h | 6 ++++++
>> 2 files changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
>> index 492eddeb481f..ba2dde24c1f7 100644
>> --- a/fs/overlayfs/inode.c
>> +++ b/fs/overlayfs/inode.c
>> @@ -460,7 +460,7 @@ struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu)
>> const struct cred *old_cred;
>> struct posix_acl *acl;
>>
>> - if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode))
>> + if (!IS_POSIXACL(realinode))
>> return NULL;
>>
>> if (rcu)
>> diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
>> index 4f34b7e02eee..3d8de16a76e9 100644
>> --- a/fs/overlayfs/overlayfs.h
>> +++ b/fs/overlayfs/overlayfs.h
>> @@ -599,7 +599,13 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name,
>> int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name,
>> void *value, size_t size);
>> ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
>> +
>> +#ifdef CONFIG_FS_POSIX_ACL
>> struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu);
>> +#else
>> +#define ovl_get_acl NULL
>> +#endif
>> +
>
> Shouldn't ovl_get_acl() definition also be wrapped in #ifdef
> CONFIG_FS_POSIX_ACL?
Of course.
Best Reagrds
Yang Xu
>
> Thanks,
> Miklos
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-28 1:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-15 11:06 [PATCH] overlayfs: improve ovl_get_acl Yang Xu
2022-07-27 13:33 ` Miklos Szeredi
2022-07-28 1:50 ` xuyang2018.jy
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).