xfs: add inline helper to convert from data fork to xfs_attr_shortform
RFC PATCH 1/1 xfs: add inline helper to convert from data fork to xfs_attr_shortform
Hi folks, while working on the attr structs cleanup, I've noticed there are so many places where we do:
(struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data;
So, I thought it would be worth to add another inline function to do this conversion and remove all these casts.
To achieve this, it will be required to include xfs_inode.h header on xfs_attr_sf.h, so it can access the xfs_inode definition. Also, if this patch is an acceptable idea, it will make sense then to keep the xfs_attr_sf_totsize() function also inside xfs_attr_sf.h (which has been moved on my series to avoid the additional #include), so, I thought on sending this RFC patch to get comments if it's a good idea or not, and, if it is, I'll add this patch to my series before sending it over.
I didn't focus on check if this patch is totally correct (only build test), since my idea is to gather you guys opinions about having this new inline function, so don't bother on reviewing the patch itself by now, only the function name if you guys prefer some other name.
Also, this patch is build on top of my clean up series (V2), not yet sent to the list, so it won't apply anyway.
Cheers.
--- fs/xfs/libxfs/xfs_attr.c | 4 ++-- fs/xfs/libxfs/xfs_attr_leaf.c | 16 ++++++++-------- fs/xfs/libxfs/xfs_attr_sf.h | 6 ++++++ fs/xfs/xfs_attr_list.c | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-)
fs/xfs/libxfs/xfs_attr.c +2 -2
@@ -525,8 +525,8 @@ xfs_attr_set(/* total space in use */ static inline int xfs_attr_sf_totsize (struct xfs_inode *dp) { -struct xfs_attr_shortform *sf = - (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data; +struct xfs_attr_shortform *sf =xfs_attr_ifork_to_sf (dp); +return be16_to_cpu (sf->hdr.totsize); }
fs/xfs/libxfs/xfs_attr_leaf.c +8 -8
@@ -681,7 +681,7 @@ xfs_attr_sf_findname(int end;int i; - sf = (struct xfs_attr_shortform *)args->dp->i_afp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (args->dp); sfe = &sf->list[0 ]; end = sf->hdr.count; for (i = 0; i < end; sfe = xfs_attr_sf_nextentry(sfe),
@@ -728,14 +728,14 @@ xfs_attr_shortform_add( ifp = dp->i_afp;ASSERT (ifp->if_flags &XFS_IFINLINE ); - sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (dp);if (xfs_attr_sf_findname (args, &sfe,NULL ) == -EEXIST )ASSERT (0 ); offset = (char *)sfe - (char *)sf; size =xfs_attr_sf_entsize_byname (args->namelen, args->valuelen);xfs_idata_realloc (dp, size,XFS_ATTR_FORK ); - sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (dp); sfe = (struct xfs_attr_sf_entry *)((char *)sf + offset); sfe->namelen = args->namelen;
@@ -787,7 +787,7 @@ xfs_attr_shortform_remove( dp = args->dp; mp = dp->i_mount; - sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (dp); error =xfs_attr_sf_findname (args, &sfe, &base);if (error != -EEXIST )
@@ -846,7 +846,7 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args) ifp = args->dp->i_afp;ASSERT (ifp->if_flags &XFS_IFINLINE ); - sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (args->dp); sfe = &sf->list[0 ];for (i =0 ; i < sf->hdr.count; sfe =xfs_attr_sf_nextentry (sfe), i++) {
@@ -873,7 +873,7 @@ xfs_attr_shortform_getvalue(int i;ASSERT (args->dp->i_afp->if_flags ==XFS_IFINLINE ); - sf = (struct xfs_attr_shortform *)args->dp->i_afp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (args->dp); sfe = &sf->list[0 ];for (i =0 ; i < sf->hdr.count; sfe =xfs_attr_sf_nextentry (sfe), i++) {
@@ -908,7 +908,7 @@ xfs_attr_shortform_to_leaf( dp = args->dp; ifp = dp->i_afp; - sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (dp); size =be16_to_cpu (sf->hdr.totsize); tmpbuffer =kmem_alloc (size,0 );ASSERT (tmpbuffer !=NULL );
@@ -1018,7 +1018,7 @@ xfs_attr_shortform_verify(ASSERT (ip->i_afp->if_format ==XFS_DINODE_FMT_LOCAL ); ifp =XFS_IFORK_PTR (ip,XFS_ATTR_FORK ); - sfp = (struct xfs_attr_shortform *)ifp->if_u1.if_data; + sfp =xfs_attr_ifork_to_sf (ip); size = ifp->if_bytes;/*
fs/xfs/libxfs/xfs_attr_sf.h +6 -0
@@ -3,6 +3,8 @@* Copyright (c) 2000,2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ + +#include "xfs_inode.h" #ifndef __XFS_ATTR_SF_H__#define __XFS_ATTR_SF_H__
@@ -47,4 +49,8 @@ xfs_attr_sf_nextentry(struct xfs_attr_sf_entry *sfep) { xfs_attr_sf_entsize(sfep)); } +static inline struct xfs_attr_shortform * +xfs_attr_ifork_to_sf (struct xfs_inode *ino) { +return (struct xfs_attr_shortform *)ino->i_afp->if_u1.if_data; +}#endif /* __XFS_ATTR_SF_H__ */
fs/xfs/xfs_attr_list.c +1 -1
@@ -61,7 +61,7 @@ xfs_attr_shortform_list(int error =0 ;ASSERT (dp->i_afp !=NULL ); - sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (dp);ASSERT (sf !=NULL );if (!sf->hdr.count)return 0 ;
Signature · 1 line
2.26.2
Quoted 34 lines · Carlos Maiolino
Hi folks, while working on the attr structs cleanup, I've noticed there are so many places where we do:
(struct
xfs_attr_shortform*)dp->i_afp->if_u1.if_data;So, I thought it would be worth to add another inline function to do this conversion and remove all these casts.
To achieve this, it will be required to include
xfs_inode.hheader onxfs_attr_sf.h, so it can access thexfs_inodedefinition. Also, if this patch is an acceptable idea, it will make sense then to keep thexfs_attr_sf_totsize()function also insidexfs_attr_sf.h(which has been moved on my series to avoid the additional #include), so, I thought on sending this RFC patch to get comments if it's a good idea or not, and, if it is, I'll add this patch to my series before sending it over.I didn't focus on check if this patch is totally correct (only build test), since my idea is to gather you guys opinions about having this new inline function, so don't bother on reviewing the patch itself by now, only the function name if you guys prefer some other name.
Also, this patch is build on top of my clean up series (V2), not yet sent to the list, so it won't apply anyway.
Cheers.
Signed-off-by Carlos Maiolino <[email protected]>--- fs/xfs/libxfs/xfs_attr.c | 4 ++-- fs/xfs/libxfs/xfs_attr_leaf.c | 16 ++++++++-------- fs/xfs/libxfs/xfs_attr_sf.h | 6 ++++++ fs/xfs/xfs_attr_list.c | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-)
...
fs/xfs/libxfs/xfs_attr_sf.h line 7
Quoted 10 lines
fs/xfs/libxfs/xfs_attr_sf.h +2
-0@@ -3,6 +3,8 @@* Copyright (c) 2000,2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ + +#include "xfs_inode.h"
FWIW, I thought we tried to avoid including headers from other headers like this. I'm also wondering if it's an issue that we'd be including a a header that is external to libxfs from a libxfs header. Perhaps this could be simplified by passing the xfs_ifork pointer to the new helper rather than the xfs_inode and/or moving the helper to libxfs/xfs_inode_fork.h and putting a forward declaration of xfs_attr_shortform in there..?
Brian
Quoted 28 lines
fs/xfs/libxfs/xfs_attr_sf.h +4
-0#ifndef __XFS_ATTR_SF_H__#define __XFS_ATTR_SF_H__@@ -47,4 +49,8 @@ xfs_attr_sf_nextentry(struct xfs_attr_sf_entry *sfep) { xfs_attr_sf_entsize(sfep)); } +static inline struct xfs_attr_shortform * +xfs_attr_ifork_to_sf (struct xfs_inode *ino) { +return (struct xfs_attr_shortform *)ino->i_afp->if_u1.if_data; +}#endif /* __XFS_ATTR_SF_H__ */ fs/xfs/xfs_attr_list.c +1
-1@@ -61,7 +61,7 @@ xfs_attr_shortform_list(int error =0 ;ASSERT (dp->i_afp !=NULL ); - sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (dp);ASSERT (sf !=NULL );if (!sf->hdr.count)return 0 ;Signature · 1 line
2.26.2
Quoted 7 lines · Brian Foster
FWIW, I thought we tried to avoid including headers from other headers like this. I'm also wondering if it's an issue that we'd be including a a header that is external to libxfs from a libxfs header. Perhaps this could be simplified by passing the
xfs_iforkpointer to the new helper rather than thexfs_inodeand/or moving the helper tolibxfs/xfs_inode_fork.hand putting a forward declaration ofxfs_attr_shortformin there..?
Or just turn it into a macro, which might be easiet?
Quoted 4 lines
fs/xfs/libxfs/xfs_attr_sf.h xfs_attr_sf_nextentry(struct xfs_attr_sf_entry *sfep) { · line 55
Quoted 4 lines
fs/xfs/libxfs/xfs_attr_sf.h +4
-0+static inline struct xfs_attr_shortform * +xfs_attr_ifork_to_sf (struct xfs_inode *ino) { +return (struct xfs_attr_shortform *)ino->i_afp->if_u1.if_data; +}
I also find the name a little strange as it takes the inode
maybe xfs_inode_to_attr_sf ?
Quoted 47 lines · Brian Foster
Quoted 34 lines · Carlos Maiolino
Hi folks, while working on the attr structs cleanup, I've noticed there are so many places where we do:
(struct
xfs_attr_shortform*)dp->i_afp->if_u1.if_data;So, I thought it would be worth to add another inline function to do this conversion and remove all these casts.
To achieve this, it will be required to include
xfs_inode.hheader onxfs_attr_sf.h, so it can access thexfs_inodedefinition. Also, if this patch is an acceptable idea, it will make sense then to keep thexfs_attr_sf_totsize()function also insidexfs_attr_sf.h(which has been moved on my series to avoid the additional #include), so, I thought on sending this RFC patch to get comments if it's a good idea or not, and, if it is, I'll add this patch to my series before sending it over.I didn't focus on check if this patch is totally correct (only build test), since my idea is to gather you guys opinions about having this new inline function, so don't bother on reviewing the patch itself by now, only the function name if you guys prefer some other name.
Also, this patch is build on top of my clean up series (V2), not yet sent to the list, so it won't apply anyway.
Cheers.
Signed-off-by Carlos Maiolino <[email protected]>--- fs/xfs/libxfs/xfs_attr.c | 4 ++-- fs/xfs/libxfs/xfs_attr_leaf.c | 16 ++++++++-------- fs/xfs/libxfs/xfs_attr_sf.h | 6 ++++++ fs/xfs/xfs_attr_list.c | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-)...
fs/xfs/libxfs/xfs_attr_sf.h line 7
Quoted 10 lines
fs/xfs/libxfs/xfs_attr_sf.h +2
-0@@ -3,6 +3,8 @@* Copyright (c) 2000,2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ + +#include "xfs_inode.h"
Quoted 7 lines
FWIW, I thought we tried to avoid including headers from other headers like this. I'm also wondering if it's an issue that we'd be including a a header that is external to libxfs from a libxfs header. Perhaps this could be simplified by passing the
xfs_iforkpointer to the new helper rather than thexfs_inodeand/or moving the helper tolibxfs/xfs_inode_fork.hand putting a forward declaration ofxfs_attr_shortformin there..?
If you change if_data to a (void *), all the casts become unnecessary, right?
--D
Quoted 31 lines
Brian
Quoted 28 lines
fs/xfs/libxfs/xfs_attr_sf.h +4
-0#ifndef __XFS_ATTR_SF_H__#define __XFS_ATTR_SF_H__@@ -47,4 +49,8 @@ xfs_attr_sf_nextentry(struct xfs_attr_sf_entry *sfep) { xfs_attr_sf_entsize(sfep)); } +static inline struct xfs_attr_shortform * +xfs_attr_ifork_to_sf (struct xfs_inode *ino) { +return (struct xfs_attr_shortform *)ino->i_afp->if_u1.if_data; +}#endif /* __XFS_ATTR_SF_H__ */ fs/xfs/xfs_attr_list.c +1
-1@@ -61,7 +61,7 @@ xfs_attr_shortform_list(int error =0 ;ASSERT (dp->i_afp !=NULL ); - sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data; + sf =xfs_attr_ifork_to_sf (dp);ASSERT (sf !=NULL );if (!sf->hdr.count)return 0 ;Signature · 1 line
2.26.2
Quoted 10 lines · Darrick J. Wong
Quoted 7 lines
FWIW, I thought we tried to avoid including headers from other headers like this. I'm also wondering if it's an issue that we'd be including a a header that is external to libxfs from a libxfs header. Perhaps this could be simplified by passing the
xfs_iforkpointer to the new helper rather than thexfs_inodeand/or moving the helper tolibxfs/xfs_inode_fork.hand putting a forward declaration ofxfs_attr_shortformin there..?If you change
if_datato a (void *), all the casts become unnecessary, right?
Yes, that is probably an even better idea.