| Message ID | 20200114081051.297488-26-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/29] xfs: remove the ATTR_INCOMPLETE flag | expand |
On Tue, Jan 14, 2020 at 09:10:47AM +0100, Christoph Hellwig wrote: > Move the function to xfs_acl.c and provide a proper stub for the > !CONFIG_XFS_POSIX_ACL case. Lift the flags check to the caller as it > nicely fits in there. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_acl.c | 16 ++++++++++++++++ > fs/xfs/xfs_acl.h | 4 ++-- > fs/xfs/xfs_ioctl.c | 4 ++-- > fs/xfs/xfs_xattr.c | 26 ++------------------------ > 4 files changed, 22 insertions(+), 28 deletions(-) > > diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c > index 89f076e2ed7d..c993ffd9b767 100644 > --- a/fs/xfs/xfs_acl.c > +++ b/fs/xfs/xfs_acl.c > @@ -264,3 +264,19 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) > > return error; > } > + > +/* > + * Invalidate any cached ACLs if the user has bypassed the ACL interface. > + * We don't validate the content whatsoever so it is caller responsibility to > + * provide data in valid format and ensure i_mode is consistent. > + */ > +void > +xfs_forget_acl( > + struct inode *inode, > + const char *name) > +{ > + if (!strcmp(name, SGI_ACL_FILE)) > + forget_cached_acl(inode, ACL_TYPE_ACCESS); > + else if (!strcmp(name, SGI_ACL_DEFAULT)) > + forget_cached_acl(inode, ACL_TYPE_DEFAULT); > +} > diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h > index 94615e34bc86..bd8a306046a9 100644 > --- a/fs/xfs/xfs_acl.h > +++ b/fs/xfs/xfs_acl.h > @@ -13,14 +13,14 @@ struct posix_acl; > extern struct posix_acl *xfs_get_acl(struct inode *inode, int type); > extern int xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); > extern int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); > +void xfs_forget_acl(struct inode *inode, const char *name); > #else > static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type) > { > return NULL; > } > # define xfs_set_acl NULL > +# define xfs_forget_acl(inode, name) 0 Hm, won't that make gcc cough up "warning: statement with no effect" warnings when posix acls are disabled? I think the way we usually do this is to define it to ((void) 0)... --D > #endif /* CONFIG_XFS_POSIX_ACL */ > > -extern void xfs_forget_acl(struct inode *inode, const char *name, int xflags); > - > #endif /* __XFS_ACL_H__ */ > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index 899a3b41fa91..7a1ff66b4786 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -509,8 +509,8 @@ xfs_attrmulti_attr_set( > } > > error = xfs_attr_set(&args); > - if (!error) > - xfs_forget_acl(inode, name, flags); > + if (!error && (flags & ATTR_ROOT)) > + xfs_forget_acl(inode, name); > kfree(args.value); > return error; > } > diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c > index e1951d2b878e..863e9fdec162 100644 > --- a/fs/xfs/xfs_xattr.c > +++ b/fs/xfs/xfs_xattr.c > @@ -37,28 +37,6 @@ xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused, > return args.valuelen; > } > > -void > -xfs_forget_acl( > - struct inode *inode, > - const char *name, > - int xflags) > -{ > - /* > - * Invalidate any cached ACLs if the user has bypassed the ACL > - * interface. We don't validate the content whatsoever so it is caller > - * responsibility to provide data in valid format and ensure i_mode is > - * consistent. > - */ > - if (xflags & ATTR_ROOT) { > -#ifdef CONFIG_XFS_POSIX_ACL > - if (!strcmp(name, SGI_ACL_FILE)) > - forget_cached_acl(inode, ACL_TYPE_ACCESS); > - else if (!strcmp(name, SGI_ACL_DEFAULT)) > - forget_cached_acl(inode, ACL_TYPE_DEFAULT); > -#endif > - } > -} > - > static int > xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused, > struct inode *inode, const char *name, const void *value, > @@ -81,8 +59,8 @@ xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused, > args.flags |= ATTR_REPLACE; > > error = xfs_attr_set(&args); > - if (!error) > - xfs_forget_acl(inode, name, args.flags); > + if (!error && (flags & ATTR_ROOT)) > + xfs_forget_acl(inode, name); > return error; > } > > -- > 2.24.1 >
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 89f076e2ed7d..c993ffd9b767 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -264,3 +264,19 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) return error; } + +/* + * Invalidate any cached ACLs if the user has bypassed the ACL interface. + * We don't validate the content whatsoever so it is caller responsibility to + * provide data in valid format and ensure i_mode is consistent. + */ +void +xfs_forget_acl( + struct inode *inode, + const char *name) +{ + if (!strcmp(name, SGI_ACL_FILE)) + forget_cached_acl(inode, ACL_TYPE_ACCESS); + else if (!strcmp(name, SGI_ACL_DEFAULT)) + forget_cached_acl(inode, ACL_TYPE_DEFAULT); +} diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h index 94615e34bc86..bd8a306046a9 100644 --- a/fs/xfs/xfs_acl.h +++ b/fs/xfs/xfs_acl.h @@ -13,14 +13,14 @@ struct posix_acl; extern struct posix_acl *xfs_get_acl(struct inode *inode, int type); extern int xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); extern int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); +void xfs_forget_acl(struct inode *inode, const char *name); #else static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type) { return NULL; } # define xfs_set_acl NULL +# define xfs_forget_acl(inode, name) 0 #endif /* CONFIG_XFS_POSIX_ACL */ -extern void xfs_forget_acl(struct inode *inode, const char *name, int xflags); - #endif /* __XFS_ACL_H__ */ diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 899a3b41fa91..7a1ff66b4786 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -509,8 +509,8 @@ xfs_attrmulti_attr_set( } error = xfs_attr_set(&args); - if (!error) - xfs_forget_acl(inode, name, flags); + if (!error && (flags & ATTR_ROOT)) + xfs_forget_acl(inode, name); kfree(args.value); return error; } diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c index e1951d2b878e..863e9fdec162 100644 --- a/fs/xfs/xfs_xattr.c +++ b/fs/xfs/xfs_xattr.c @@ -37,28 +37,6 @@ xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused, return args.valuelen; } -void -xfs_forget_acl( - struct inode *inode, - const char *name, - int xflags) -{ - /* - * Invalidate any cached ACLs if the user has bypassed the ACL - * interface. We don't validate the content whatsoever so it is caller - * responsibility to provide data in valid format and ensure i_mode is - * consistent. - */ - if (xflags & ATTR_ROOT) { -#ifdef CONFIG_XFS_POSIX_ACL - if (!strcmp(name, SGI_ACL_FILE)) - forget_cached_acl(inode, ACL_TYPE_ACCESS); - else if (!strcmp(name, SGI_ACL_DEFAULT)) - forget_cached_acl(inode, ACL_TYPE_DEFAULT); -#endif - } -} - static int xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused, struct inode *inode, const char *name, const void *value, @@ -81,8 +59,8 @@ xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused, args.flags |= ATTR_REPLACE; error = xfs_attr_set(&args); - if (!error) - xfs_forget_acl(inode, name, args.flags); + if (!error && (flags & ATTR_ROOT)) + xfs_forget_acl(inode, name); return error; }
Move the function to xfs_acl.c and provide a proper stub for the !CONFIG_XFS_POSIX_ACL case. Lift the flags check to the caller as it nicely fits in there. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_acl.c | 16 ++++++++++++++++ fs/xfs/xfs_acl.h | 4 ++-- fs/xfs/xfs_ioctl.c | 4 ++-- fs/xfs/xfs_xattr.c | 26 ++------------------------ 4 files changed, 22 insertions(+), 28 deletions(-)