attr cleanups v3
Hi all,
this series started by trying to remove xfs_attr_shortform as sparse complains about it due using a variable sized array in struct using in a variable sized array. I ended up cleaning a lot more code around it once I started looking into it, including some basic cleanups for the inode fork inline data memory management (I'll have another series for more work there at a later time).
Note that the dir2 equivalent for the structure has already been removed long time ago.
Changes since v2:
- fix use of an uninitialized error variable for impossible to hit code paths
- add a patch to turn the above checks into asserts
Changes since v1:
- fix commit message typos
- better document the shortform attr layout, stealing text from the dir2_sf definition.
Diffstat:
libxfs/xfs_attr.c | 33 ++---- libxfs/xfs_attr_leaf.c | 215 ++++++++++++++------------------------------ libxfs/xfs_attr_leaf.h | 7 - libxfs/xfs_attr_sf.h | 24 +++- libxfs/xfs_bmap.c | 4 libxfs/xfs_da_format.h | 33 +++--- libxfs/xfs_dir2.c | 2 libxfs/xfs_dir2_block.c | 6 - libxfs/xfs_dir2_sf.c | 78 ++++++--------- libxfs/xfs_iext_tree.c | 36 +++---- libxfs/xfs_inode_fork.c | 70 ++++++-------- libxfs/xfs_inode_fork.h | 10 -- libxfs/xfs_ondisk.h | 14 +- libxfs/xfs_symlink_remote.c | 4 scrub/attr.c | 17 +-- scrub/inode_repair.c | 4 scrub/readdir.c | 6 - scrub/symlink.c | 2 xfs_attr_list.c | 13 +- xfs_dir2_readdir.c | 6 - xfs_inode.c | 6 - xfs_inode_item.c | 10 -- xfs_symlink.c | 4 23 files changed, 245 insertions(+), 359 deletions(-)
PATCH 1/9 xfs: make if_data a void pointer
The xfs_ifork structure currently has a union of the if_root void pointer and the if_data char pointer. In either case it is an opaque pointer that depends on the fork format. Replace the union with a single if_data void pointer as that is what almost all callers want. Only the symlink NULL termination code in xfs_init_local_fork actually needs a new local variable now.
--- fs/xfs/libxfs/xfs_attr.c | 3 +- fs/xfs/libxfs/xfs_attr_leaf.c | 62 ++++++++++++------------------ fs/xfs/libxfs/xfs_bmap.c | 4 +- fs/xfs/libxfs/xfs_dir2.c | 2 +- fs/xfs/libxfs/xfs_dir2_block.c | 6 +-- fs/xfs/libxfs/xfs_dir2_sf.c | 61 ++++++++++++----------------- fs/xfs/libxfs/xfs_iext_tree.c | 36 ++++++++--------- fs/xfs/libxfs/xfs_inode_fork.c | 53 ++++++++++++------------- fs/xfs/libxfs/xfs_inode_fork.h | 8 ++-- fs/xfs/libxfs/xfs_symlink_remote.c | 4 +- fs/xfs/scrub/attr.c | 10 ++--- fs/xfs/scrub/readdir.c | 6 +-- fs/xfs/scrub/symlink.c | 2 +- fs/xfs/xfs_attr_list.c | 3 +- fs/xfs/xfs_dir2_readdir.c | 6 +-- fs/xfs/xfs_inode.c | 6 +-- fs/xfs/xfs_inode_item.c | 10 ++--- fs/xfs/xfs_symlink.c | 4 +- 18 files changed, 119 insertions(+), 167 deletions(-)
fs/xfs/libxfs/xfs_attr.c +1 -2
@@ -1049,9 +1049,8 @@ xfs_attr_set(static inline int xfs_attr_sf_totsize (struct xfs_inode *dp) { -struct xfs_attr_shortform *sf; +struct xfs_attr_shortform *sf = dp->i_af.if_data; - sf = (struct xfs_attr_shortform *)dp->i_af.if_u1.if_data;return be16_to_cpu (sf->hdr.totsize); }
fs/xfs/libxfs/xfs_attr_leaf.c +24 -38
151 lines not on this page · raw message
fs/xfs/libxfs/xfs_bmap.c +2 -2
@@ -747,7 +747,7 @@ xfs_bmap_local_to_extents_empty(ASSERT (ifp->if_nextents ==0 );xfs_bmap_forkoff_reset (ip, whichfork); - ifp->if_u1.if_root =NULL ; + ifp->if_data =NULL ; ifp->if_height =0 ; ifp->if_format =XFS_DINODE_FMT_EXTENTS ;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );
@@ -832,7 +832,7 @@ xfs_bmap_local_to_extents(xfs_bmap_local_to_extents_empty (tp, ip, whichfork); flags |=XFS_ILOG_CORE ; - ifp->if_u1.if_root =NULL ; + ifp->if_data =NULL ; ifp->if_height =0 ; rec.br_startoff =0 ;
fs/xfs/libxfs/xfs_dir2.c +1 -1
@@ -196,7 +196,7 @@ xfs_dir_isempty(return 1 ;if (dp->i_disk_size >xfs_inode_data_fork_size (dp))return 0 ; - sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; + sfp = dp->i_df.if_data;return !sfp->count; }
fs/xfs/libxfs/xfs_dir2_block.c +2 -4
@@ -1089,7 +1089,7 @@ xfs_dir2_sf_to_block(int newoffset;/* offset from current entry */ unsigned int offset = geo->data_entry_offset;xfs_dir2_sf_entry_t *sfep;/* sf entry pointer */ -xfs_dir2_sf_hdr_t *oldsfp;/* old shortform header */ +struct xfs_dir2_sf_hdr *oldsfp = ifp->if_data;xfs_dir2_sf_hdr_t *sfp;/* shortform header */ __be16 *tagp;/* end of data entry */ struct xfs_name name;
@@ -1099,10 +1099,8 @@ xfs_dir2_sf_to_block(ASSERT (ifp->if_format ==XFS_DINODE_FMT_LOCAL );ASSERT (dp->i_disk_size >= offsetof(struct xfs_dir2_sf_hdr , parent)); - oldsfp = (xfs_dir2_sf_hdr_t *)ifp->if_u1.if_data; -ASSERT (ifp->if_bytes == dp->i_disk_size); -ASSERT (ifp->if_u1.if_data !=NULL ); +ASSERT (oldsfp !=NULL );ASSERT (dp->i_disk_size >=xfs_dir2_sf_hdr_size (oldsfp->i8count));ASSERT (dp->i_df.if_nextents ==0 );
fs/xfs/libxfs/xfs_dir2_sf.c +24 -37
251 lines not on this page · raw message
fs/xfs/libxfs/xfs_iext_tree.c +18 -18
@@ -158,7 +158,7 @@ static void *xfs_iext_find_first_leaf ( struct xfs_ifork *ifp) { -struct xfs_iext_node *node = ifp->if_u1.if_root; +struct xfs_iext_node *node = ifp->if_data;int height;if (!ifp->if_height)
@@ -176,7 +176,7 @@ static void *xfs_iext_find_last_leaf ( struct xfs_ifork *ifp) { -struct xfs_iext_node *node = ifp->if_u1.if_root; +struct xfs_iext_node *node = ifp->if_data;int height, i;if (!ifp->if_height)
@@ -306,7 +306,7 @@ xfs_iext_find_level( xfs_fileoff_t offset, int level) { -struct xfs_iext_node *node = ifp->if_u1.if_root; +struct xfs_iext_node *node = ifp->if_data;int height, i;if (!ifp->if_height)
@@ -402,12 +402,12 @@ xfs_iext_grow(int i;if (ifp->if_height ==1 ) { -struct xfs_iext_leaf *prev = ifp->if_u1.if_root; +struct xfs_iext_leaf *prev = ifp->if_data; node->keys[0 ] =xfs_iext_leaf_key (prev,0 ); node->ptrs[0 ] = prev; }else { -struct xfs_iext_node *prev = ifp->if_u1.if_root; +struct xfs_iext_node *prev = ifp->if_data;ASSERT (ifp->if_height >1 );
@@ -418,7 +418,7 @@ xfs_iext_grow(for (i =1 ; i <KEYS_PER_NODE ; i++) node->keys[i] =XFS_IEXT_KEY_INVALID ; - ifp->if_u1.if_root = node; + ifp->if_data = node; ifp->if_height++; }
@@ -430,7 +430,7 @@ xfs_iext_update_node(int level, void *ptr) { - struct xfs_iext_node *node = ifp->if_u1.if_root; + struct xfs_iext_node *node = ifp->if_data;int height, i;for (height = ifp->if_height; height > level; height--) {
@@ -583,11 +583,11 @@ xfs_iext_alloc_root( {ASSERT (ifp->if_bytes ==0 ); - ifp->if_u1.if_root =kmem_zalloc (sizeof (struct xfs_iext_rec ),KM_NOFS ); + ifp->if_data =kmem_zalloc (sizeof (struct xfs_iext_rec ),KM_NOFS ); ifp->if_height =1 ;/* now that we have a node step into it */ - cur->leaf = ifp->if_u1.if_root; + cur->leaf = ifp->if_data; cur->pos =0 ; }
@@ -603,9 +603,9 @@ xfs_iext_realloc_root(if (new_size /sizeof (struct xfs_iext_rec ) ==RECS_PER_LEAF ) new_size =NODE_SIZE ; - new =krealloc (ifp->if_u1.if_root, new_size,GFP_NOFS | __GFP_NOFAIL); + new =krealloc (ifp->if_data, new_size,GFP_NOFS | __GFP_NOFAIL);memset (new + ifp->if_bytes,0 , new_size - ifp->if_bytes); - ifp->if_u1.if_root = new; + ifp->if_data = new; cur->leaf = new; }
@@ -786,8 +786,8 @@ xfs_iext_remove_node(* If we are at the root and only one entry is left we can just * free this node and update the root pointer. */ -ASSERT (node == ifp->if_u1.if_root); - ifp->if_u1.if_root = node->ptrs[0 ]; +ASSERT (node == ifp->if_data); + ifp->if_data = node->ptrs[0 ]; ifp->if_height--;kmem_free (node); }
@@ -863,8 +863,8 @@ xfs_iext_free_last_leaf( struct xfs_ifork *ifp) { ifp->if_height--; -kmem_free (ifp->if_u1.if_root); - ifp->if_u1.if_root =NULL ; +kmem_free (ifp->if_data); + ifp->if_data =NULL ; }void
@@ -881,7 +881,7 @@ xfs_iext_remove(trace_xfs_iext_remove (ip, cur, state, _RET_IP_);ASSERT (ifp->if_height >0 ); -ASSERT (ifp->if_u1.if_root !=NULL ); +ASSERT (ifp->if_data !=NULL );ASSERT (xfs_iext_valid (ifp, cur));xfs_iext_inc_seq (ifp);
@@ -1051,9 +1051,9 @@ voidxfs_iext_destroy ( struct xfs_ifork *ifp) { -xfs_iext_destroy_node (ifp->if_u1.if_root, ifp->if_height); +xfs_iext_destroy_node (ifp->if_data, ifp->if_height); ifp->if_bytes =0 ; ifp->if_height =0 ; - ifp->if_u1.if_root =NULL ; + ifp->if_data =NULL ; }
fs/xfs/libxfs/xfs_inode_fork.c +24 -29
125 lines not on this page · raw message
fs/xfs/libxfs/xfs_inode_fork.h +3 -5
@@ -13,14 +13,12 @@ struct xfs_dinode;* File incore extent information, present for each of data & attr forks. */ struct xfs_ifork { -int64_t if_bytes;/* bytes in if_u1 */ +int64_t if_bytes;/* bytes in if_data */ struct xfs_btree_block *if_broot;/* file's incore btree root */ unsigned int if_seq;/* fork mod counter */ int if_height;/* height of the extent tree */ -union { -void *if_root;/* extent tree root */ -char *if_data;/* inline file data */ - } if_u1; +void *if_data;/* extent tree root or +inline data */ xfs_extnum_t if_nextents;/* # of extents in this fork */ short if_broot_bytes;/* bytes allocated for root */ int8_t if_format;/* format of this fork */
fs/xfs/libxfs/xfs_symlink_remote.c +2 -2
@@ -175,7 +175,7 @@ xfs_symlink_local_to_remote(if (!xfs_has_crc (mp)) { bp->b_ops =NULL ; -memcpy (bp->b_addr, ifp->if_u1.if_data, ifp->if_bytes); +memcpy (bp->b_addr, ifp->if_data, ifp->if_bytes);xfs_trans_log_buf (tp, bp,0 , ifp->if_bytes -1 );return ; }
@@ -191,7 +191,7 @@ xfs_symlink_local_to_remote( buf = bp->b_addr; buf +=xfs_symlink_hdr_set (mp, ip->i_ino,0 , ifp->if_bytes, bp); -memcpy (buf, ifp->if_u1.if_data, ifp->if_bytes); +memcpy (buf, ifp->if_data, ifp->if_bytes);xfs_trans_log_buf (tp, bp,0 ,sizeof (struct xfs_dsymlink_hdr ) + ifp->if_bytes -1 ); }
fs/xfs/scrub/attr.c +3 -7
@@ -527,19 +527,15 @@ xchk_xattr_check_sf( struct xfs_scrub *sc) {struct xchk_xattr_buf *ab = sc->buf; -struct xfs_attr_shortform *sf; +struct xfs_ifork *ifp = &sc->ip->i_af; +struct xfs_attr_shortform *sf = ifp->if_data;struct xfs_attr_sf_entry *sfe;struct xfs_attr_sf_entry *next; -struct xfs_ifork *ifp; -unsigned char *end; +unsigned char *end = ifp->if_data + ifp->if_bytes;int i;int error =0 ; - ifp =xfs_ifork_ptr (sc->ip,XFS_ATTR_FORK ); -bitmap_zero (ab->usedmap, ifp->if_bytes); - sf = (struct xfs_attr_shortform *)sc->ip->i_af.if_u1.if_data; - end = (unsigned char *)ifp->if_u1.if_data + ifp->if_bytes;xchk_xattr_set_map (sc, ab->usedmap,0 ,sizeof (sf->hdr)); sfe = &sf->list[0 ];
fs/xfs/scrub/readdir.c +2 -4
@@ -36,16 +36,14 @@ xchk_dir_walk_sf(struct xfs_mount *mp = dp->i_mount;struct xfs_da_geometry *geo = mp->m_dir_geo;struct xfs_dir2_sf_entry *sfep; -struct xfs_dir2_sf_hdr *sfp; +struct xfs_dir2_sf_hdr *sfp = dp->i_df.if_data;xfs_ino_t ino;xfs_dir2_dataptr_t dapos;unsigned int i;int error;ASSERT (dp->i_df.if_bytes == dp->i_disk_size); -ASSERT (dp->i_df.if_u1.if_data !=NULL ); - - sfp = (struct xfs_dir2_sf_hdr *)dp->i_df.if_u1.if_data; +ASSERT (sfp !=NULL );/* dot entry */ dapos = xfs_dir2_db_off_to_dataptr(geo, geo->datablk,
fs/xfs/scrub/symlink.c +1 -1
@@ -61,7 +61,7 @@ xchk_symlink(/* Inline symlink? */ if (ifp->if_format ==XFS_DINODE_FMT_LOCAL ) {if (len >xfs_inode_data_fork_size (ip) || - len >strnlen (ifp->if_u1.if_data,xfs_inode_data_fork_size (ip))) + len >strnlen (ifp->if_data,xfs_inode_data_fork_size (ip)))xchk_fblock_set_corrupt (sc,XFS_DATA_FORK ,0 );return 0 ; }
fs/xfs/xfs_attr_list.c +1 -2
@@ -56,12 +56,11 @@ xfs_attr_shortform_list(struct xfs_attrlist_cursor_kern *cursor = &context->cursor;struct xfs_inode *dp = context->dp;struct xfs_attr_sf_sort *sbuf, *sbp; -struct xfs_attr_shortform *sf; +struct xfs_attr_shortform *sf = dp->i_af.if_data;struct xfs_attr_sf_entry *sfe;int sbsize, nsbuf, count, i;int error =0 ; - sf = (struct xfs_attr_shortform *)dp->i_af.if_u1.if_data;ASSERT (sf !=NULL );if (!sf->hdr.count)return 0 ;
fs/xfs/xfs_dir2_readdir.c +2 -4
@@ -52,7 +52,7 @@ xfs_dir2_sf_getdents(struct xfs_mount *mp = dp->i_mount;xfs_dir2_dataptr_t off;/* current entry's offset */ xfs_dir2_sf_entry_t *sfep;/* shortform directory entry */ -xfs_dir2_sf_hdr_t *sfp;/* shortform structure */ +struct xfs_dir2_sf_hdr *sfp = dp->i_df.if_data;xfs_dir2_dataptr_t dot_offset;xfs_dir2_dataptr_t dotdot_offset;xfs_ino_t ino;
@@ -60,9 +60,7 @@ xfs_dir2_sf_getdents(ASSERT (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL );ASSERT (dp->i_df.if_bytes == dp->i_disk_size); -ASSERT (dp->i_df.if_u1.if_data !=NULL ); - - sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; +ASSERT (sfp !=NULL );/* * If the block number in the offset is out of range, we're done.
fs/xfs/xfs_inode.c +3 -3
@@ -872,7 +872,7 @@ xfs_init_new_inode(case S_IFLNK : ip->i_df.if_format =XFS_DINODE_FMT_EXTENTS ; ip->i_df.if_bytes =0 ; - ip->i_df.if_u1.if_root =NULL ; + ip->i_df.if_data =NULL ;break ;default :ASSERT (0 );
@@ -2378,8 +2378,8 @@ xfs_ifree(* already been freed by xfs_attr_inactive. */ if (ip->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) { -kmem_free (ip->i_df.if_u1.if_data); - ip->i_df.if_u1.if_data =NULL ; +kmem_free (ip->i_df.if_data); + ip->i_df.if_data =NULL ; ip->i_df.if_bytes =0 ; }
fs/xfs/xfs_inode_item.c +4 -6
@@ -352,11 +352,10 @@ xfs_inode_item_format_data_fork( ~(XFS_ILOG_DEXT |XFS_ILOG_DBROOT |XFS_ILOG_DEV );if ((iip->ili_fields &XFS_ILOG_DDATA ) && ip->i_df.if_bytes >0 ) { -ASSERT (ip->i_df.if_u1.if_data !=NULL ); +ASSERT (ip->i_df.if_data !=NULL );ASSERT (ip->i_disk_size >0 );xlog_copy_iovec (lv, vecp,XLOG_REG_TYPE_ILOCAL , - ip->i_df.if_u1.if_data, - ip->i_df.if_bytes); + ip->i_df.if_data, ip->i_df.if_bytes); ilf->ilf_dsize = (unsigned )ip->i_df.if_bytes; ilf->ilf_size++; }else {
@@ -431,10 +430,9 @@ xfs_inode_item_format_attr_fork(if ((iip->ili_fields &XFS_ILOG_ADATA ) && ip->i_af.if_bytes >0 ) { -ASSERT (ip->i_af.if_u1.if_data !=NULL ); +ASSERT (ip->i_af.if_data !=NULL );xlog_copy_iovec (lv, vecp,XLOG_REG_TYPE_IATTR_LOCAL , - ip->i_af.if_u1.if_data, - ip->i_af.if_bytes); + ip->i_af.if_data, ip->i_af.if_bytes); ilf->ilf_asize = (unsigned )ip->i_af.if_bytes; ilf->ilf_size++; }else {
fs/xfs/xfs_symlink.c +2 -2
@@ -131,10 +131,10 @@ xfs_readlink(* The VFS crashes on a NULL pointer, so return -EFSCORRUPTED * if if_data is junk. */ -if (XFS_IS_CORRUPT (ip->i_mount, !ip->i_df.if_u1.if_data)) +if (XFS_IS_CORRUPT (ip->i_mount, !ip->i_df.if_data)) goto out; -memcpy (link, ip->i_df.if_u1.if_data, pathlen +1 ); +memcpy (link, ip->i_df.if_data, pathlen +1 ); error =0 ; }else { error =xfs_readlink_bmap_ilocked (ip, link);
Signature · 1 line
2.39.2
PATCH 2/9 xfs: return if_data from xfs_idata_realloc
In reply to Christoph HellwigMany of the xfs_idata_realloc callers need to set a local pointer to the just reallocated if_data memory. Return the pointer to simplify them a bit and use the opportunity to re-use krealloc for freeing if_data if the size hits 0.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 7 +++---- fs/xfs/libxfs/xfs_dir2_sf.c | 25 ++++++++++--------------- fs/xfs/libxfs/xfs_inode_fork.c | 20 ++++++++------------ fs/xfs/libxfs/xfs_inode_fork.h | 2 +- 4 files changed, 22 insertions(+), 32 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +3 -4
@@ -690,8 +690,8 @@ xfs_attr_shortform_create(ASSERT (ifp->if_bytes ==0 );if (ifp->if_format ==XFS_DINODE_FMT_EXTENTS ) ifp->if_format =XFS_DINODE_FMT_LOCAL ; -xfs_idata_realloc (dp,sizeof (*hdr),XFS_ATTR_FORK ); - hdr = ifp->if_data; + + hdr =xfs_idata_realloc (dp,sizeof (*hdr),XFS_ATTR_FORK );memset (hdr,0 ,sizeof (*hdr)); hdr->totsize =cpu_to_be16 (sizeof (*hdr));xfs_trans_log_inode (args->trans, dp,XFS_ILOG_CORE |XFS_ILOG_ADATA );
@@ -767,8 +767,7 @@ xfs_attr_shortform_add( offset = (char *)sfe - (char *)sf; size =xfs_attr_sf_entsize_byname (args->namelen, args->valuelen); -xfs_idata_realloc (dp, size,XFS_ATTR_FORK ); - sf = ifp->if_data; + sf =xfs_idata_realloc (dp, size,XFS_ATTR_FORK ); sfe = (struct xfs_attr_sf_entry *)((char *)sf + offset); sfe->namelen = args->namelen;
fs/xfs/libxfs/xfs_dir2_sf.c +10 -15
@@ -466,12 +466,11 @@ xfs_dir2_sf_addname_easy(/* * Grow the in-inode space. */ -xfs_idata_realloc (dp,xfs_dir2_sf_entsize (mp, sfp, args->namelen), + sfp =xfs_idata_realloc (dp,xfs_dir2_sf_entsize (mp, sfp, args->namelen),XFS_DATA_FORK );/* * Need to set up again due to realloc of the inode data. */ - sfp = dp->i_df.if_data; sfep = (xfs_dir2_sf_entry_t *)((char *)sfp + byteoff);/* * Fill in the new entry.
@@ -551,11 +550,8 @@ xfs_dir2_sf_addname_hard(* the data. */ xfs_idata_realloc (dp, -old_isize,XFS_DATA_FORK ); -xfs_idata_realloc (dp, new_isize,XFS_DATA_FORK ); -/* -* Reset the pointer since the buffer was reallocated. -*/ - sfp = dp->i_df.if_data; + sfp =xfs_idata_realloc (dp, new_isize,XFS_DATA_FORK ); +/* * Copy the first part of the directory, including the header. */
@@ -820,15 +816,13 @@ xfs_dir2_sf_create(ASSERT (dp->i_df.if_bytes ==0 ); i8count = pino >XFS_DIR2_MAX_SHORT_INUM ; size =xfs_dir2_sf_hdr_size (i8count); +/* -* Make a buffer for the data. -*/ -xfs_idata_realloc (dp, size,XFS_DATA_FORK ); -/* -* Fill in the header, +* Make a buffer for the data and fill in the header. */ - sfp = dp->i_df.if_data; + sfp =xfs_idata_realloc (dp, size,XFS_DATA_FORK ); sfp->i8count = i8count; +/* * Now can put in the inode number, since i8count is set. */
@@ -976,11 +970,12 @@ xfs_dir2_sf_removename(*/ sfp->count--; dp->i_disk_size = newsize; +/* * Reallocate, making it smaller. */ -xfs_idata_realloc (dp, newsize - oldsize,XFS_DATA_FORK ); - sfp = dp->i_df.if_data; + sfp =xfs_idata_realloc (dp, newsize - oldsize,XFS_DATA_FORK ); +/* * Are we changing inode number size? */
fs/xfs/libxfs/xfs_inode_fork.c +8 -12
@@ -496,7 +496,7 @@ xfs_iroot_realloc(* byte_diff -- the change in the number of bytes, positive or negative, * requested for the if_data array. */ -void +void * xfs_idata_realloc( struct xfs_inode *ip, int64_t byte_diff,
@@ -508,19 +508,15 @@ xfs_idata_realloc(ASSERT (new_size >=0 );ASSERT (new_size <=xfs_inode_fork_size (ip, whichfork)); -if (byte_diff ==0 ) -return ; - -if (new_size ==0 ) { -kmem_free (ifp->if_data); - ifp->if_data =NULL ; - ifp->if_bytes =0 ; -return ; +if (byte_diff) { + ifp->if_data =krealloc (ifp->if_data, new_size, +GFP_NOFS | __GFP_NOFAIL); +if (new_size ==0 ) + ifp->if_data =NULL ; + ifp->if_bytes = new_size; } - ifp->if_data =krealloc (ifp->if_data, new_size, -GFP_NOFS | __GFP_NOFAIL); - ifp->if_bytes = new_size; +return ifp->if_data; }/* Free all memory and reset a fork back to its initial state. */
fs/xfs/libxfs/xfs_inode_fork.h +1 -1
@@ -168,7 +168,7 @@ int xfs_iformat_attr_fork(struct xfs_inode *, struct xfs_dinode *);void xfs_iflush_fork (struct xfs_inode *,struct xfs_dinode *,struct xfs_inode_log_item *,int );void xfs_idestroy_fork (struct xfs_ifork *ifp); -void xfs_idata_realloc (struct xfs_inode *ip,int64_t byte_diff, +void *xfs_idata_realloc (struct xfs_inode *ip,int64_t byte_diff,int whichfork);void xfs_iroot_realloc (struct xfs_inode *,int ,int );int xfs_iread_extents (struct xfs_trans *,struct xfs_inode *,int );
Signature · 1 line
2.39.2
PATCH 3/9 xfs: move the xfs_attr_sf_lookup tracepoint
In reply to Christoph Hellwigtrace_xfs_attr_sf_lookup is currently only called by xfs_attr_shortform_lookup, which despit it's name is a simple helper for xfs_attr_shortform_addname, which has it's own tracing. Move the callsite to xfs_attr_shortform_getvalue, which is the closest thing to a high level lookup we have for the Linux xattr API.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +3 -2
@@ -876,8 +876,6 @@ xfs_attr_shortform_lookup(struct xfs_attr_sf_entry *sfe;int i; -trace_xfs_attr_sf_lookup (args); -ASSERT (ifp->if_format ==XFS_DINODE_FMT_LOCAL ); sfe = &sf->list[0 ]; for (i = 0; i < sf->hdr.count;
@@ -905,6 +903,9 @@ xfs_attr_shortform_getvalue(int i;ASSERT (args->dp->i_af.if_format ==XFS_DINODE_FMT_LOCAL ); + +trace_xfs_attr_sf_lookup (args); + sfe = &sf->list[0 ];for (i =0 ; i < sf->hdr.count; sfe =xfs_attr_sf_nextentry (sfe), i++) {
Signature · 1 line
2.39.2
PATCH 4/9 xfs: simplify xfs_attr_sf_findname
In reply to Christoph Hellwigxfs_attr_sf_findname has the simple job of finding a xfs_attr_sf_entry in the attr fork, but the convoluted calling convention obfuscates that.
Return the found entry as the return value instead of an pointer argument, as the -ENOATTR/-EEXIST can be trivally derived from that, and remove the basep argument, as it is equivalent of the offset of sfe in the data for if an sfe was found, or an offset of totsize if not was found. To simplify the totsize computation add a xfs_attr_sf_endptr helper that returns the imaginative xfs_attr_sf_entry at the end of the current attrs.
--- fs/xfs/libxfs/xfs_attr.c | 7 ++- fs/xfs/libxfs/xfs_attr_leaf.c | 96 +++++++++++++---------------------- fs/xfs/libxfs/xfs_attr_leaf.h | 4 +- fs/xfs/libxfs/xfs_attr_sf.h | 7 +++ 4 files changed, 48 insertions(+), 66 deletions(-)
fs/xfs/libxfs/xfs_attr.c +5 -2
@@ -862,8 +862,11 @@ xfs_attr_lookup(if (!xfs_inode_hasattr (dp))return -ENOATTR ; -if (dp->i_af.if_format ==XFS_DINODE_FMT_LOCAL ) -return xfs_attr_sf_findname (args,NULL ,NULL ); +if (dp->i_af.if_format ==XFS_DINODE_FMT_LOCAL ) { +if (xfs_attr_sf_findname (args)) +return -EEXIST ; +return -ENOATTR ; + }if (xfs_attr_is_leaf (dp)) { error =xfs_attr_leaf_hasname (args, &bp);
fs/xfs/libxfs/xfs_attr_leaf.c +35 -61
142 lines not on this page · raw message
fs/xfs/libxfs/xfs_attr_leaf.h +1 -3
@@ -51,9 +51,7 @@ int xfs_attr_shortform_lookup(struct xfs_da_args *args);int xfs_attr_shortform_getvalue (struct xfs_da_args *args);int xfs_attr_shortform_to_leaf (struct xfs_da_args *args);int xfs_attr_sf_removename (struct xfs_da_args *args); -int xfs_attr_sf_findname (struct xfs_da_args *args, -struct xfs_attr_sf_entry **sfep, -unsigned int *basep); +struct xfs_attr_sf_entry *xfs_attr_sf_findname (struct xfs_da_args *args);int xfs_attr_shortform_allfit (struct xfs_buf *bp,struct xfs_inode *dp);int xfs_attr_shortform_bytesfit (struct xfs_inode *dp,int bytes); xfs_failaddr_t xfs_attr_shortform_verify(struct xfs_attr_shortform *sfp,
fs/xfs/libxfs/xfs_attr_sf.h +7 -0
@@ -48,4 +48,11 @@ xfs_attr_sf_nextentry(struct xfs_attr_sf_entry *sfep) return (void *)sfep + xfs_attr_sf_entsize(sfep); } +/* pointer to the space after the last entry, e.g. for adding a new one */ +static inline struct xfs_attr_sf_entry * +xfs_attr_sf_endptr (struct xfs_attr_shortform *sf) +{ +return (void *)sf +be16_to_cpu (sf->hdr.totsize); +} +#endif /* __XFS_ATTR_SF_H__ */
Signature · 1 line
2.39.2
PATCH 5/9 xfs: remove xfs_attr_shortform_lookup
In reply to Christoph Hellwigxfs_attr_shortform_lookup is only used by xfs_attr_shortform_addname, which is much better served by calling xfs_attr_sf_findname. Switch it over and remove xfs_attr_shortform_lookup.
--- fs/xfs/libxfs/xfs_attr.c | 21 +++++++-------------- fs/xfs/libxfs/xfs_attr_leaf.c | 24 ------------------------ fs/xfs/libxfs/xfs_attr_leaf.h | 1 - 3 files changed, 7 insertions(+), 39 deletions(-)
fs/xfs/libxfs/xfs_attr.c +7 -14
@@ -1066,19 +1066,14 @@ xfs_attr_shortform_addname( struct xfs_da_args *args) {int newsize, forkoff; -int error;trace_xfs_attr_sf_addname (args); - error =xfs_attr_shortform_lookup (args); -switch (error) { -case -ENOATTR : -if (args->op_flags &XFS_DA_OP_REPLACE ) -return error; -break ; -case -EEXIST : +if (xfs_attr_sf_findname (args)) { +int error; +if (!(args->op_flags &XFS_DA_OP_REPLACE )) -return error; +return -EEXIST ; error =xfs_attr_sf_removename (args);if (error)
@@ -1091,11 +1086,9 @@ xfs_attr_shortform_addname(* around. */ args->op_flags &= ~XFS_DA_OP_REPLACE ; -break ; -case 0 : -break ; -default : -return error; + }else { +if (args->op_flags &XFS_DA_OP_REPLACE ) +return -ENOATTR ; } if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||
fs/xfs/libxfs/xfs_attr_leaf.c +0 -24
@@ -837,30 +837,6 @@ xfs_attr_sf_removename(return 0 ; } -/* -* Look up a name in a shortform attribute list structure. -*/ -/*ARGSUSED*/ -int -xfs_attr_shortform_lookup ( -struct xfs_da_args *args) -{ -struct xfs_ifork *ifp = &args->dp->i_af; -struct xfs_attr_shortform *sf = ifp->if_data; -struct xfs_attr_sf_entry *sfe; -int i; - -ASSERT (ifp->if_format ==XFS_DINODE_FMT_LOCAL ); - sfe = &sf->list[0 ]; -for (i =0 ; i < sf->hdr.count; - sfe =xfs_attr_sf_nextentry (sfe), i++) { -if (xfs_attr_match (args, sfe->namelen, sfe->nameval, - sfe->flags)) -return -EEXIST ; - } -return -ENOATTR ; -} -/* * Retrieve the attribute value and length. *
fs/xfs/libxfs/xfs_attr_leaf.h +0 -1
@@ -47,7 +47,6 @@ struct xfs_attr3_icleaf_hdr {*/ void xfs_attr_shortform_create (struct xfs_da_args *args);void xfs_attr_shortform_add (struct xfs_da_args *args,int forkoff); -int xfs_attr_shortform_lookup (struct xfs_da_args *args);int xfs_attr_shortform_getvalue (struct xfs_da_args *args);int xfs_attr_shortform_to_leaf (struct xfs_da_args *args);int xfs_attr_sf_removename (struct xfs_da_args *args);
Signature · 1 line
2.39.2
PATCH 6/9 xfs: use xfs_attr_sf_findname in xfs_attr_shortform_getvalue
In reply to Christoph Hellwigxfs_attr_shortform_getvalue duplicates the logic in xfs_attr_sf_findname. Use the helper instead.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +5 -11
@@ -848,23 +848,17 @@ intxfs_attr_shortform_getvalue ( struct xfs_da_args *args) { -struct xfs_attr_shortform *sf = args->dp->i_af.if_data;struct xfs_attr_sf_entry *sfe; -int i;ASSERT (args->dp->i_af.if_format ==XFS_DINODE_FMT_LOCAL );trace_xfs_attr_sf_lookup (args); - sfe = &sf->list[0 ]; -for (i =0 ; i < sf->hdr.count; - sfe =xfs_attr_sf_nextentry (sfe), i++) { -if (xfs_attr_match (args, sfe->namelen, sfe->nameval, - sfe->flags)) -return xfs_attr_copy_value (args, - &sfe->nameval[args->namelen], sfe->valuelen); - } -return -ENOATTR ; + sfe =xfs_attr_sf_findname (args); +if (!sfe) +return -ENOATTR ; +return xfs_attr_copy_value (args, &sfe->nameval[args->namelen], + sfe->valuelen); }/* Convert from using the shortform to the leaf format. */
Signature · 1 line
2.39.2
PATCH 7/9 xfs: remove struct xfs_attr_shortform
In reply to Christoph Hellwigsparse complains about struct xfs_attr_shortform because it embeds a structure with a variable sized array in a variable sized array.
Given that xfs_attr_shortform is not a very useful structure, and the dir2 equivalent has been removed a long time ago, remove it as well.
Provide a xfs_attr_sf_firstentry helper that returns the first xfs_attr_sf_entry behind a xfs_attr_sf_hdr to replace the structure dereference.
--- fs/xfs/libxfs/xfs_attr.c | 4 ++-- fs/xfs/libxfs/xfs_attr_leaf.c | 37 +++++++++++++++++----------------- fs/xfs/libxfs/xfs_attr_leaf.h | 2 +- fs/xfs/libxfs/xfs_attr_sf.h | 13 +++++++++--- fs/xfs/libxfs/xfs_da_format.h | 33 +++++++++++++++++------------- fs/xfs/libxfs/xfs_inode_fork.c | 5 ++--- fs/xfs/libxfs/xfs_ondisk.h | 14 ++++++------- fs/xfs/scrub/attr.c | 9 ++++----- fs/xfs/scrub/inode_repair.c | 4 ++-- fs/xfs/xfs_attr_list.c | 12 +++++------ 10 files changed, 71 insertions(+), 62 deletions(-)
fs/xfs/libxfs/xfs_attr.c +2 -2
@@ -1052,9 +1052,9 @@ xfs_attr_set(static inline int xfs_attr_sf_totsize (struct xfs_inode *dp) { -struct xfs_attr_shortform *sf = dp->i_af.if_data; +struct xfs_attr_sf_hdr *sf = dp->i_af.if_data; -return be16_to_cpu (sf->hdr.totsize); +return be16_to_cpu (sf->totsize); }/*
fs/xfs/libxfs/xfs_attr_leaf.c +18 -19
@@ -704,10 +704,10 @@ struct xfs_attr_sf_entry *xfs_attr_sf_findname ( struct xfs_da_args *args) { -struct xfs_attr_shortform *sf = args->dp->i_af.if_data; +struct xfs_attr_sf_hdr *sf = args->dp->i_af.if_data;struct xfs_attr_sf_entry *sfe; -for (sfe = &sf->list[0 ]; +for (sfe =xfs_attr_sf_firstentry (sf); sfe <xfs_attr_sf_endptr (sf); sfe =xfs_attr_sf_nextentry (sfe)) { if (xfs_attr_match(args, sfe->namelen, sfe->nameval,
@@ -730,7 +730,7 @@ xfs_attr_shortform_add(struct xfs_inode *dp = args->dp;struct xfs_mount *mp = dp->i_mount;struct xfs_ifork *ifp = &dp->i_af; -struct xfs_attr_shortform *sf = ifp->if_data; +struct xfs_attr_sf_hdr *sf = ifp->if_data;struct xfs_attr_sf_entry *sfe;int size;
@@ -750,8 +750,8 @@ xfs_attr_shortform_add( sfe->flags = args->attr_filter;memcpy (sfe->nameval, args->name, args->namelen);memcpy (&sfe->nameval[args->namelen], args->value, args->valuelen); - sf->hdr.count++; -be16_add_cpu (&sf->hdr.totsize, size); + sf->count++; +be16_add_cpu (&sf->totsize, size);xfs_trans_log_inode (args->trans, dp,XFS_ILOG_CORE |XFS_ILOG_ADATA );xfs_sbversion_add_attr2 (mp, args->trans);
@@ -782,9 +782,9 @@ xfs_attr_sf_removename( {struct xfs_inode *dp = args->dp;struct xfs_mount *mp = dp->i_mount; -struct xfs_attr_shortform *sf = dp->i_af.if_data; +struct xfs_attr_sf_hdr *sf = dp->i_af.if_data;struct xfs_attr_sf_entry *sfe; -uint16_t totsize =be16_to_cpu (sf->hdr.totsize); +uint16_t totsize =be16_to_cpu (sf->totsize);void *next, *end;int size =0 ;
@@ -809,9 +809,9 @@ xfs_attr_sf_removename( end =xfs_attr_sf_endptr (sf);if (next < end)memmove (sfe, next, end - next); - sf->hdr.count--; + sf->count--; totsize -= size; - sf->hdr.totsize =cpu_to_be16 (totsize); + sf->totsize =cpu_to_be16 (totsize);/* * Fix up the start offset of the attribute fork
@@ -868,21 +868,21 @@ xfs_attr_shortform_to_leaf( {struct xfs_inode *dp = args->dp;struct xfs_ifork *ifp = &dp->i_af; -struct xfs_attr_shortform *sf = ifp->if_data; +struct xfs_attr_sf_hdr *sf = ifp->if_data;struct xfs_attr_sf_entry *sfe; +int size =be16_to_cpu (sf->totsize);struct xfs_da_args nargs;char *tmpbuffer; -int error, i, size; +int error, i;xfs_dablk_t blkno;struct xfs_buf *bp;trace_xfs_attr_sf_to_leaf (args); - size =be16_to_cpu (sf->hdr.totsize); tmpbuffer =kmem_alloc (size,0 );ASSERT (tmpbuffer !=NULL );memcpy (tmpbuffer, ifp->if_data, size); - sf = (struct xfs_attr_shortform *)tmpbuffer; + sf = (struct xfs_attr_sf_hdr *)tmpbuffer;xfs_idata_realloc (dp, -size,XFS_ATTR_FORK );xfs_bmap_local_to_extents_empty (args->trans, dp,XFS_ATTR_FORK );
@@ -905,8 +905,8 @@ xfs_attr_shortform_to_leaf( nargs.trans = args->trans; nargs.op_flags =XFS_DA_OP_OKNOENT ; - sfe = &sf->list[0 ]; -for (i =0 ; i < sf->hdr.count; i++) { + sfe =xfs_attr_sf_firstentry (sf); +for (i =0 ; i < sf->count; i++) { nargs.name = sfe->nameval; nargs.namelen = sfe->namelen; nargs.value = &sfe->nameval[nargs.namelen];
@@ -973,10 +973,10 @@ xfs_attr_shortform_allfit(/* Verify the consistency of a raw inline attribute fork. */ xfs_failaddr_t xfs_attr_shortform_verify ( -struct xfs_attr_shortform *sfp, +struct xfs_attr_sf_hdr *sfp,size_t size) { -struct xfs_attr_sf_entry *sfep; +struct xfs_attr_sf_entry *sfep =xfs_attr_sf_firstentry (sfp);struct xfs_attr_sf_entry *next_sfep;char *endp;int i;
@@ -990,8 +990,7 @@ xfs_attr_shortform_verify( endp = (char *)sfp + size;/* Check all reported entries */ - sfep = &sfp->list[0 ]; -for (i =0 ; i < sfp->hdr.count; i++) { +for (i =0 ; i < sfp->count; i++) {/* * struct xfs_attr_sf_entry has a variable length. * Check the fixed-offset parts of the structure are
fs/xfs/libxfs/xfs_attr_leaf.h +1 -1
@@ -53,7 +53,7 @@ int xfs_attr_sf_removename(struct xfs_da_args *args);struct xfs_attr_sf_entry *xfs_attr_sf_findname (struct xfs_da_args *args);int xfs_attr_shortform_allfit (struct xfs_buf *bp,struct xfs_inode *dp);int xfs_attr_shortform_bytesfit (struct xfs_inode *dp,int bytes); -xfs_failaddr_t xfs_attr_shortform_verify (struct xfs_attr_shortform *sfp, +xfs_failaddr_t xfs_attr_shortform_verify (struct xfs_attr_sf_hdr *sfp,size_t size);void xfs_attr_fork_remove (struct xfs_inode *ip,struct xfs_trans *tp);
fs/xfs/libxfs/xfs_attr_sf.h +10 -3
@@ -41,7 +41,14 @@ static inline int xfs_attr_sf_entsize(struct xfs_attr_sf_entry *sfep)return struct_size (sfep, nameval, sfep->namelen + sfep->valuelen); } -/* next entry in struct */ +/* first entry in the SF attr fork */ +static inline struct xfs_attr_sf_entry * +xfs_attr_sf_firstentry (struct xfs_attr_sf_hdr *hdr) +{ +return (struct xfs_attr_sf_entry *)(hdr +1 ); +} + +/* next entry after sfep */ static inline struct xfs_attr_sf_entry *xfs_attr_sf_nextentry (struct xfs_attr_sf_entry *sfep) {
@@ -50,9 +57,9 @@ xfs_attr_sf_nextentry(struct xfs_attr_sf_entry *sfep)/* pointer to the space after the last entry, e.g. for adding a new one */ static inline struct xfs_attr_sf_entry * -xfs_attr_sf_endptr (struct xfs_attr_shortform *sf) +xfs_attr_sf_endptr (struct xfs_attr_sf_hdr *sf) { -return (void *)sf +be16_to_cpu (sf->hdr.totsize); +return (void *)sf +be16_to_cpu (sf->totsize); }#endif /* __XFS_ATTR_SF_H__ */
fs/xfs/libxfs/xfs_da_format.h +19 -14
@@ -578,20 +578,25 @@ xfs_dir2_block_leaf_p(struct xfs_dir2_block_tail *btp)#define XFS_ATTR_LEAF_MAPSIZE 3/* how many freespace slots */ /* -* Entries are packed toward the top as tight as possible. -*/ -struct xfs_attr_shortform { -struct xfs_attr_sf_hdr {/* constant-structure header block */ -__be16 totsize;/* total bytes in shortform list */ -__u8 count;/* count of active entries */ -__u8 padding; - } hdr; -struct xfs_attr_sf_entry { -uint8_t namelen;/* actual length of name (no NULL) */ -uint8_t valuelen;/* actual length of value (no NULL) */ -uint8_t flags;/* flags bits (see xfs_attr_leaf.h) */ -uint8_t nameval[];/* name & value bytes concatenated */ - } list[];/* variable sized array */ +* Attribute storage when stored inside the inode. +* +* Small attribute lists are packed as tightly as possible so as to fit into the +* literal area of the inode. +* +* These "shortform" attribute forks consist of a single xfs_attr_sf_hdr header +* followed by zero or more xfs_attr_sf_entry structures. +*/ +struct xfs_attr_sf_hdr {/* constant-structure header block */ +__be16 totsize;/* total bytes in shortform list */ +__u8 count;/* count of active entries */ +__u8 padding; +}; + +struct xfs_attr_sf_entry { +__u8 namelen;/* actual length of name (no NULL) */ +__u8 valuelen;/* actual length of value (no NULL) */ +__u8 flags;/* flags bits (XFS_ATTR_*) */ +__u8 nameval[];/* name & value bytes concatenated */ }; typedef struct xfs_attr_leaf_map { /* RLE map of free bytes */
fs/xfs/libxfs/xfs_inode_fork.c +2 -3
@@ -279,10 +279,9 @@ static uint16_txfs_dfork_attr_shortform_size ( struct xfs_dinode *dip) { -struct xfs_attr_shortform *atp = - (struct xfs_attr_shortform *)XFS_DFORK_APTR (dip); +struct xfs_attr_sf_hdr *sf =XFS_DFORK_APTR (dip); -return be16_to_cpu (atp->hdr.totsize); +return be16_to_cpu (sf->totsize); }void
fs/xfs/libxfs/xfs_ondisk.h +7 -7
@@ -93,13 +93,13 @@ xfs_check_ondisk_structs(void)XFS_CHECK_OFFSET (xfs_attr_leaf_name_remote_t, namelen,8 );XFS_CHECK_OFFSET (xfs_attr_leaf_name_remote_t, name,9 );XFS_CHECK_STRUCT_SIZE (xfs_attr_leafblock_t,32 ); - XFS_CHECK_STRUCT_SIZE(struct xfs_attr_shortform, 4); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, hdr.totsize, 0); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, hdr.count, 2); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].namelen, 4); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].valuelen, 5); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].flags, 6); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].nameval, 7); + XFS_CHECK_STRUCT_SIZE(struct xfs_attr_sf_hdr, 4); + XFS_CHECK_OFFSET(struct xfs_attr_sf_hdr, totsize, 0); + XFS_CHECK_OFFSET(struct xfs_attr_sf_hdr, count, 2); + XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, namelen, 0); + XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, valuelen, 1); + XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, flags, 2); + XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, nameval, 3);XFS_CHECK_STRUCT_SIZE (xfs_da_blkinfo_t,12 );XFS_CHECK_STRUCT_SIZE (xfs_da_intnode_t,16 );XFS_CHECK_STRUCT_SIZE (xfs_da_node_entry_t,8 );
fs/xfs/scrub/attr.c +4 -5
@@ -528,23 +528,22 @@ xchk_xattr_check_sf( {struct xchk_xattr_buf *ab = sc->buf;struct xfs_ifork *ifp = &sc->ip->i_af; -struct xfs_attr_shortform *sf = ifp->if_data; -struct xfs_attr_sf_entry *sfe; +struct xfs_attr_sf_hdr *sf = ifp->if_data; +struct xfs_attr_sf_entry *sfe =xfs_attr_sf_firstentry (sf);struct xfs_attr_sf_entry *next;unsigned char *end = ifp->if_data + ifp->if_bytes;int i;int error =0 ;bitmap_zero (ab->usedmap, ifp->if_bytes); -xchk_xattr_set_map (sc, ab->usedmap,0 ,sizeof (sf->hdr)); +xchk_xattr_set_map (sc, ab->usedmap,0 ,sizeof (*sf)); - sfe = &sf->list[0 ];if ((unsigned char *)sfe > end) {xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK ,0 );return 0 ; } -for (i =0 ; i < sf->hdr.count; i++) { +for (i =0 ; i < sf->count; i++) {unsigned char *name = sfe->nameval;unsigned char *value = &sfe->nameval[sfe->namelen];
fs/xfs/scrub/inode_repair.c +2 -2
@@ -760,7 +760,7 @@ xrep_dinode_check_afork(struct xfs_scrub *sc, struct xfs_dinode *dip) { - struct xfs_attr_shortform *afork_ptr; + struct xfs_attr_sf_hdr *afork_ptr;size_t attr_size;unsigned int afork_size;
@@ -778,7 +778,7 @@ xrep_dinode_check_afork(return true;/* xattr structure cannot be larger than the fork */ - attr_size =be16_to_cpu (afork_ptr->hdr.totsize); + attr_size =be16_to_cpu (afork_ptr->totsize);if (attr_size > afork_size)return true;
fs/xfs/xfs_attr_list.c +6 -6
@@ -56,13 +56,13 @@ xfs_attr_shortform_list(struct xfs_attrlist_cursor_kern *cursor = &context->cursor;struct xfs_inode *dp = context->dp;struct xfs_attr_sf_sort *sbuf, *sbp; -struct xfs_attr_shortform *sf = dp->i_af.if_data; +struct xfs_attr_sf_hdr *sf = dp->i_af.if_data;struct xfs_attr_sf_entry *sfe;int sbsize, nsbuf, count, i;int error =0 ;ASSERT (sf !=NULL ); -if (!sf->hdr.count) +if (!sf->count)return 0 ;trace_xfs_attr_list_sf (context);
@@ -78,8 +78,8 @@ xfs_attr_shortform_list(*/ if (context->bufsize ==0 || (XFS_ISRESET_CURSOR (cursor) && - (dp->i_af.if_bytes + sf->hdr.count *16 ) < context->bufsize)) { -for (i =0 , sfe = &sf->list[0 ]; i < sf->hdr.count; i++) { + (dp->i_af.if_bytes + sf->count *16 ) < context->bufsize)) { +for (i =0 , sfe =xfs_attr_sf_firstentry (sf); i < sf->count; i++) {if (XFS_IS_CORRUPT (context->dp->i_mount, !xfs_attr_namecheck (sfe->nameval, sfe->namelen)))
@@ -108,7 +108,7 @@ xfs_attr_shortform_list(/* * It didn't all fit, so we have to sort everything on hashval. */ - sbsize = sf->hdr.count *sizeof (*sbuf); + sbsize = sf->count *sizeof (*sbuf); sbp = sbuf =kmem_alloc (sbsize,KM_NOFS );/*
@@ -116,7 +116,7 @@ xfs_attr_shortform_list(* the relevant info from only those that match into a buffer. */ nsbuf =0 ; -for (i =0 , sfe = &sf->list[0 ]; i < sf->hdr.count; i++) { +for (i =0 , sfe =xfs_attr_sf_firstentry (sf); i < sf->count; i++) {if (unlikely ( ((char *)sfe < (char *)sf) || ((char *)sfe >= ((char *)sf + dp->i_af.if_bytes)))) {
Signature · 1 line
2.39.2
Re: [PATCH 7/9] xfs: remove struct xfs_attr_shortform
Quoted 11 lines · Christoph Hellwig
sparse complains about struct
xfs_attr_shortformbecause it embeds a structure with a variable sized array in a variable sized array.Given that
xfs_attr_shortformis not a very useful structure, and the dir2 equivalent has been removed a long time ago, remove it as well.Provide a
xfs_attr_sf_firstentryhelper that returns the firstxfs_attr_sf_entrybehind axfs_attr_sf_hdrto replace the structure dereference.Signed-off-by Christoph Hellwig <[email protected]>
Looks ok,
--D
Quoted 388 lines
--- fs/xfs/libxfs/xfs_attr.c | 4 ++-- fs/xfs/libxfs/xfs_attr_leaf.c | 37 +++++++++++++++++----------------- fs/xfs/libxfs/xfs_attr_leaf.h | 2 +- fs/xfs/libxfs/xfs_attr_sf.h | 13 +++++++++--- fs/xfs/libxfs/xfs_da_format.h | 33 +++++++++++++++++------------- fs/xfs/libxfs/xfs_inode_fork.c | 5 ++--- fs/xfs/libxfs/xfs_ondisk.h | 14 ++++++------- fs/xfs/scrub/attr.c | 9 ++++----- fs/xfs/scrub/inode_repair.c | 4 ++-- fs/xfs/xfs_attr_list.c | 12 +++++------ 10 files changed, 71 insertions(+), 62 deletions(-)fs/xfs/libxfs/xfs_attr.c +2
-2@@ -1052,9 +1052,9 @@ xfs_attr_set(static inline int xfs_attr_sf_totsize (struct xfs_inode *dp) { -struct xfs_attr_shortform *sf = dp->i_af.if_data; +struct xfs_attr_sf_hdr *sf = dp->i_af.if_data; -return be16_to_cpu (sf->hdr.totsize); +return be16_to_cpu (sf->totsize); }/* fs/xfs/libxfs/xfs_attr_leaf.c +18
-19@@ -704,10 +704,10 @@ struct xfs_attr_sf_entry *xfs_attr_sf_findname ( struct xfs_da_args *args) { -struct xfs_attr_shortform *sf = args->dp->i_af.if_data; +struct xfs_attr_sf_hdr *sf = args->dp->i_af.if_data;struct xfs_attr_sf_entry *sfe; -for (sfe = &sf->list[0 ]; +for (sfe =xfs_attr_sf_firstentry (sf); sfe <xfs_attr_sf_endptr (sf); sfe =xfs_attr_sf_nextentry (sfe)) { if (xfs_attr_match(args, sfe->namelen, sfe->nameval,@@ -730,7 +730,7 @@ xfs_attr_shortform_add(struct xfs_inode *dp = args->dp;struct xfs_mount *mp = dp->i_mount;struct xfs_ifork *ifp = &dp->i_af; -struct xfs_attr_shortform *sf = ifp->if_data; +struct xfs_attr_sf_hdr *sf = ifp->if_data;struct xfs_attr_sf_entry *sfe;int size;@@ -750,8 +750,8 @@ xfs_attr_shortform_add( sfe->flags = args->attr_filter;memcpy (sfe->nameval, args->name, args->namelen);memcpy (&sfe->nameval[args->namelen], args->value, args->valuelen); - sf->hdr.count++; -be16_add_cpu (&sf->hdr.totsize, size); + sf->count++; +be16_add_cpu (&sf->totsize, size);xfs_trans_log_inode (args->trans, dp,XFS_ILOG_CORE |XFS_ILOG_ADATA );xfs_sbversion_add_attr2 (mp, args->trans);@@ -782,9 +782,9 @@ xfs_attr_sf_removename( {struct xfs_inode *dp = args->dp;struct xfs_mount *mp = dp->i_mount; -struct xfs_attr_shortform *sf = dp->i_af.if_data; +struct xfs_attr_sf_hdr *sf = dp->i_af.if_data;struct xfs_attr_sf_entry *sfe; -uint16_t totsize =be16_to_cpu (sf->hdr.totsize); +uint16_t totsize =be16_to_cpu (sf->totsize);void *next, *end;int size =0 ;@@ -809,9 +809,9 @@ xfs_attr_sf_removename( end =xfs_attr_sf_endptr (sf);if (next < end)memmove (sfe, next, end - next); - sf->hdr.count--; + sf->count--; totsize -= size; - sf->hdr.totsize =cpu_to_be16 (totsize); + sf->totsize =cpu_to_be16 (totsize);/* * Fix up the start offset of the attribute fork @@ -868,21 +868,21 @@ xfs_attr_shortform_to_leaf( {struct xfs_inode *dp = args->dp;struct xfs_ifork *ifp = &dp->i_af; -struct xfs_attr_shortform *sf = ifp->if_data; +struct xfs_attr_sf_hdr *sf = ifp->if_data;struct xfs_attr_sf_entry *sfe; +int size =be16_to_cpu (sf->totsize);struct xfs_da_args nargs;char *tmpbuffer; -int error, i, size; +int error, i;xfs_dablk_t blkno;struct xfs_buf *bp;trace_xfs_attr_sf_to_leaf (args); - size =be16_to_cpu (sf->hdr.totsize); tmpbuffer =kmem_alloc (size,0 );ASSERT (tmpbuffer !=NULL );memcpy (tmpbuffer, ifp->if_data, size); - sf = (struct xfs_attr_shortform *)tmpbuffer; + sf = (struct xfs_attr_sf_hdr *)tmpbuffer;xfs_idata_realloc (dp, -size,XFS_ATTR_FORK );xfs_bmap_local_to_extents_empty (args->trans, dp,XFS_ATTR_FORK );@@ -905,8 +905,8 @@ xfs_attr_shortform_to_leaf( nargs.trans = args->trans; nargs.op_flags =XFS_DA_OP_OKNOENT ; - sfe = &sf->list[0 ]; -for (i =0 ; i < sf->hdr.count; i++) { + sfe =xfs_attr_sf_firstentry (sf); +for (i =0 ; i < sf->count; i++) { nargs.name = sfe->nameval; nargs.namelen = sfe->namelen; nargs.value = &sfe->nameval[nargs.namelen];@@ -973,10 +973,10 @@ xfs_attr_shortform_allfit(/* Verify the consistency of a raw inline attribute fork. */ xfs_failaddr_t xfs_attr_shortform_verify ( -struct xfs_attr_shortform *sfp, +struct xfs_attr_sf_hdr *sfp,size_t size) { -struct xfs_attr_sf_entry *sfep; +struct xfs_attr_sf_entry *sfep =xfs_attr_sf_firstentry (sfp);struct xfs_attr_sf_entry *next_sfep;char *endp;int i;@@ -990,8 +990,7 @@ xfs_attr_shortform_verify( endp = (char *)sfp + size;/* Check all reported entries */ - sfep = &sfp->list[0 ]; -for (i =0 ; i < sfp->hdr.count; i++) { +for (i =0 ; i < sfp->count; i++) {/* * struct xfs_attr_sf_entry has a variable length. * Check the fixed-offset parts of the structure are fs/xfs/libxfs/xfs_attr_leaf.h +1
-1@@ -53,7 +53,7 @@ int xfs_attr_sf_removename(struct xfs_da_args *args);struct xfs_attr_sf_entry *xfs_attr_sf_findname (struct xfs_da_args *args);int xfs_attr_shortform_allfit (struct xfs_buf *bp,struct xfs_inode *dp);int xfs_attr_shortform_bytesfit (struct xfs_inode *dp,int bytes); -xfs_failaddr_t xfs_attr_shortform_verify (struct xfs_attr_shortform *sfp, +xfs_failaddr_t xfs_attr_shortform_verify (struct xfs_attr_sf_hdr *sfp,size_t size);void xfs_attr_fork_remove (struct xfs_inode *ip,struct xfs_trans *tp);fs/xfs/libxfs/xfs_attr_sf.h +10
-3@@ -41,7 +41,14 @@ static inline int xfs_attr_sf_entsize(struct xfs_attr_sf_entry *sfep)return struct_size (sfep, nameval, sfep->namelen + sfep->valuelen); } -/* next entry in struct */ +/* first entry in the SF attr fork */ +static inline struct xfs_attr_sf_entry * +xfs_attr_sf_firstentry (struct xfs_attr_sf_hdr *hdr) +{ +return (struct xfs_attr_sf_entry *)(hdr +1 ); +} + +/* next entry after sfep */ static inline struct xfs_attr_sf_entry *xfs_attr_sf_nextentry (struct xfs_attr_sf_entry *sfep) {@@ -50,9 +57,9 @@ xfs_attr_sf_nextentry(struct xfs_attr_sf_entry *sfep)/* pointer to the space after the last entry, e.g. for adding a new one */ static inline struct xfs_attr_sf_entry * -xfs_attr_sf_endptr (struct xfs_attr_shortform *sf) +xfs_attr_sf_endptr (struct xfs_attr_sf_hdr *sf) { -return (void *)sf +be16_to_cpu (sf->hdr.totsize); +return (void *)sf +be16_to_cpu (sf->totsize); }#endif /* __XFS_ATTR_SF_H__ */ fs/xfs/libxfs/xfs_da_format.h +19
-14@@ -578,20 +578,25 @@ xfs_dir2_block_leaf_p(struct xfs_dir2_block_tail *btp)#define XFS_ATTR_LEAF_MAPSIZE 3/* how many freespace slots */ /* -* Entries are packed toward the top as tight as possible. -*/ -struct xfs_attr_shortform { -struct xfs_attr_sf_hdr {/* constant-structure header block */ -__be16 totsize;/* total bytes in shortform list */ -__u8 count;/* count of active entries */ -__u8 padding; - } hdr; -struct xfs_attr_sf_entry { -uint8_t namelen;/* actual length of name (no NULL) */ -uint8_t valuelen;/* actual length of value (no NULL) */ -uint8_t flags;/* flags bits (see xfs_attr_leaf.h) */ -uint8_t nameval[];/* name & value bytes concatenated */ - } list[];/* variable sized array */ +* Attribute storage when stored inside the inode. +* +* Small attribute lists are packed as tightly as possible so as to fit into the +* literal area of the inode. +* +* These "shortform" attribute forks consist of a single xfs_attr_sf_hdr header +* followed by zero or more xfs_attr_sf_entry structures. +*/ +struct xfs_attr_sf_hdr {/* constant-structure header block */ +__be16 totsize;/* total bytes in shortform list */ +__u8 count;/* count of active entries */ +__u8 padding; +}; + +struct xfs_attr_sf_entry { +__u8 namelen;/* actual length of name (no NULL) */ +__u8 valuelen;/* actual length of value (no NULL) */ +__u8 flags;/* flags bits (XFS_ATTR_*) */ +__u8 nameval[];/* name & value bytes concatenated */ }; typedef struct xfs_attr_leaf_map { /* RLE map of free bytes */fs/xfs/libxfs/xfs_inode_fork.c +2
-3@@ -279,10 +279,9 @@ static uint16_txfs_dfork_attr_shortform_size ( struct xfs_dinode *dip) { -struct xfs_attr_shortform *atp = - (struct xfs_attr_shortform *)XFS_DFORK_APTR (dip); +struct xfs_attr_sf_hdr *sf =XFS_DFORK_APTR (dip); -return be16_to_cpu (atp->hdr.totsize); +return be16_to_cpu (sf->totsize); }void fs/xfs/libxfs/xfs_ondisk.h +7
-7@@ -93,13 +93,13 @@ xfs_check_ondisk_structs(void)XFS_CHECK_OFFSET (xfs_attr_leaf_name_remote_t, namelen,8 );XFS_CHECK_OFFSET (xfs_attr_leaf_name_remote_t, name,9 );XFS_CHECK_STRUCT_SIZE (xfs_attr_leafblock_t,32 ); - XFS_CHECK_STRUCT_SIZE(struct xfs_attr_shortform, 4); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, hdr.totsize, 0); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, hdr.count, 2); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].namelen, 4); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].valuelen, 5); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].flags, 6); - XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].nameval, 7); + XFS_CHECK_STRUCT_SIZE(struct xfs_attr_sf_hdr, 4); + XFS_CHECK_OFFSET(struct xfs_attr_sf_hdr, totsize, 0); + XFS_CHECK_OFFSET(struct xfs_attr_sf_hdr, count, 2); + XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, namelen, 0); + XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, valuelen, 1); + XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, flags, 2); + XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, nameval, 3);XFS_CHECK_STRUCT_SIZE (xfs_da_blkinfo_t,12 );XFS_CHECK_STRUCT_SIZE (xfs_da_intnode_t,16 );XFS_CHECK_STRUCT_SIZE (xfs_da_node_entry_t,8 );fs/xfs/scrub/attr.c +4
-5@@ -528,23 +528,22 @@ xchk_xattr_check_sf( {struct xchk_xattr_buf *ab = sc->buf;struct xfs_ifork *ifp = &sc->ip->i_af; -struct xfs_attr_shortform *sf = ifp->if_data; -struct xfs_attr_sf_entry *sfe; +struct xfs_attr_sf_hdr *sf = ifp->if_data; +struct xfs_attr_sf_entry *sfe =xfs_attr_sf_firstentry (sf);struct xfs_attr_sf_entry *next;unsigned char *end = ifp->if_data + ifp->if_bytes;int i;int error =0 ;bitmap_zero (ab->usedmap, ifp->if_bytes); -xchk_xattr_set_map (sc, ab->usedmap,0 ,sizeof (sf->hdr)); +xchk_xattr_set_map (sc, ab->usedmap,0 ,sizeof (*sf)); - sfe = &sf->list[0 ];if ((unsigned char *)sfe > end) {xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK ,0 );return 0 ; } -for (i =0 ; i < sf->hdr.count; i++) { +for (i =0 ; i < sf->count; i++) {unsigned char *name = sfe->nameval;unsigned char *value = &sfe->nameval[sfe->namelen];fs/xfs/scrub/inode_repair.c +2
-2@@ -760,7 +760,7 @@ xrep_dinode_check_afork(struct xfs_scrub *sc, struct xfs_dinode *dip) { - struct xfs_attr_shortform *afork_ptr; + struct xfs_attr_sf_hdr *afork_ptr;size_t attr_size;unsigned int afork_size;@@ -778,7 +778,7 @@ xrep_dinode_check_afork(return true;/* xattr structure cannot be larger than the fork */ - attr_size =be16_to_cpu (afork_ptr->hdr.totsize); + attr_size =be16_to_cpu (afork_ptr->totsize);if (attr_size > afork_size)return true;fs/xfs/xfs_attr_list.c +6
-6@@ -56,13 +56,13 @@ xfs_attr_shortform_list(struct xfs_attrlist_cursor_kern *cursor = &context->cursor;struct xfs_inode *dp = context->dp;struct xfs_attr_sf_sort *sbuf, *sbp; -struct xfs_attr_shortform *sf = dp->i_af.if_data; +struct xfs_attr_sf_hdr *sf = dp->i_af.if_data;struct xfs_attr_sf_entry *sfe;int sbsize, nsbuf, count, i;int error =0 ;ASSERT (sf !=NULL ); -if (!sf->hdr.count) +if (!sf->count)return 0 ;trace_xfs_attr_list_sf (context);@@ -78,8 +78,8 @@ xfs_attr_shortform_list(*/ if (context->bufsize ==0 || (XFS_ISRESET_CURSOR (cursor) && - (dp->i_af.if_bytes + sf->hdr.count *16 ) < context->bufsize)) { -for (i =0 , sfe = &sf->list[0 ]; i < sf->hdr.count; i++) { + (dp->i_af.if_bytes + sf->count *16 ) < context->bufsize)) { +for (i =0 , sfe =xfs_attr_sf_firstentry (sf); i < sf->count; i++) {if (XFS_IS_CORRUPT (context->dp->i_mount, !xfs_attr_namecheck (sfe->nameval, sfe->namelen)))@@ -108,7 +108,7 @@ xfs_attr_shortform_list(/* * It didn't all fit, so we have to sort everything on hashval. */ - sbsize = sf->hdr.count *sizeof (*sbuf); + sbsize = sf->count *sizeof (*sbuf); sbp = sbuf =kmem_alloc (sbsize,KM_NOFS );/* @@ -116,7 +116,7 @@ xfs_attr_shortform_list(* the relevant info from only those that match into a buffer. */ nsbuf =0 ; -for (i =0 , sfe = &sf->list[0 ]; i < sf->hdr.count; i++) { +for (i =0 , sfe =xfs_attr_sf_firstentry (sf); i < sf->count; i++) {if (unlikely ( ((char *)sfe < (char *)sf) || ((char *)sfe >= ((char *)sf + dp->i_af.if_bytes)))) {Signature · 1 line
2.39.2
PATCH 8/9 xfs: remove xfs_attr_sf_hdr_t
In reply to Christoph HellwigRemove the last two users of the typedef.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 4 ++-- fs/xfs/libxfs/xfs_attr_sf.h | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +2 -2
@@ -816,7 +816,7 @@ xfs_attr_sf_removename(/* * Fix up the start offset of the attribute fork */ -if (totsize ==sizeof (xfs_attr_sf_hdr_t) &&xfs_has_attr2 (mp) && +if (totsize ==sizeof (struct xfs_attr_sf_hdr ) &&xfs_has_attr2 (mp) && (dp->i_df.if_format !=XFS_DINODE_FMT_BTREE ) && !(args->op_flags & (XFS_DA_OP_ADDNAME |XFS_DA_OP_REPLACE ))) {xfs_attr_fork_remove (dp, args->trans);
@@ -824,7 +824,7 @@ xfs_attr_sf_removename(xfs_idata_realloc (dp, -size,XFS_ATTR_FORK ); dp->i_forkoff =xfs_attr_shortform_bytesfit (dp, totsize);ASSERT (dp->i_forkoff); -ASSERT (totsize >sizeof (xfs_attr_sf_hdr_t) || +ASSERT (totsize >sizeof (struct xfs_attr_sf_hdr ) || (args->op_flags &XFS_DA_OP_ADDNAME ) || !xfs_has_attr2 (mp) || dp->i_df.if_format ==XFS_DINODE_FMT_BTREE );
fs/xfs/libxfs/xfs_attr_sf.h +0 -8
@@ -6,14 +6,6 @@#ifndef __XFS_ATTR_SF_H__#define __XFS_ATTR_SF_H__ -/* -* Attribute storage when stored inside the inode. -* -* Small attribute lists are packed as tightly as possible so as -* to fit into the literal area of the inode. -*/ -typedef struct xfs_attr_sf_hdr xfs_attr_sf_hdr_t ; -/* * We generate this then sort it, attr_list() must return things in hash-order. */
Signature · 1 line
2.39.2
PATCH 9/9 xfs: turn the XFS_DA_OP_REPLACE checks in xfs_attr_shortform_addname into asserts
In reply to Christoph HellwigSince commit deed9512872d ("xfs: Check for -ENOATTR or -EEXIST"), the high-level attr code does a lookup for any attr we're trying to set, and does the checks to handle the create vs replace cases, which thus never hit the low-level attr code.
Turn the checks in xfs_attr_shortform_addname as they must never trip.
--- fs/xfs/libxfs/xfs_attr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/xfs/libxfs/xfs_attr.c +2 -4
@@ -1072,8 +1072,7 @@ xfs_attr_shortform_addname(if (xfs_attr_sf_findname (args)) {int error; -if (!(args->op_flags &XFS_DA_OP_REPLACE )) -return -EEXIST ; +ASSERT (args->op_flags &XFS_DA_OP_REPLACE ); error =xfs_attr_sf_removename (args);if (error)
@@ -1087,8 +1086,7 @@ xfs_attr_shortform_addname(*/ args->op_flags &= ~XFS_DA_OP_REPLACE ; }else { -if (args->op_flags &XFS_DA_OP_REPLACE ) -return -ENOATTR ; +ASSERT (!(args->op_flags &XFS_DA_OP_REPLACE )); } if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||
Signature · 1 line
2.39.2
Re: [PATCH 9/9] xfs: turn the XFS_DA_OP_REPLACE checks in xfs_attr_shortform_addname into asserts
Quoted 8 lines · Christoph Hellwig
Since commit
deed9512872d("xfs: Check for-ENOATTRor-EEXIST"), the high-level attr code does a lookup for any attr we're trying to set, and does the checks to handle the create vs replace cases, which thus never hit the low-level attr code.Turn the checks in
xfs_attr_shortform_addnameas they must never trip.Signed-off-by Christoph Hellwig <[email protected]>
Looks ok,
--D
Quoted 32 lines
--- fs/xfs/libxfs/xfs_attr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)fs/xfs/libxfs/xfs_attr.c +2
-4@@ -1072,8 +1072,7 @@ xfs_attr_shortform_addname(if (xfs_attr_sf_findname (args)) {int error; -if (!(args->op_flags &XFS_DA_OP_REPLACE )) -return -EEXIST ; +ASSERT (args->op_flags &XFS_DA_OP_REPLACE ); error =xfs_attr_sf_removename (args);if (error)@@ -1087,8 +1086,7 @@ xfs_attr_shortform_addname(*/ args->op_flags &= ~XFS_DA_OP_REPLACE ; }else { -if (args->op_flags &XFS_DA_OP_REPLACE ) -return -ENOATTR ; +ASSERT (!(args->op_flags &XFS_DA_OP_REPLACE )); } if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||Signature · 1 line
2.39.2
Dave Chinner
Reviewed-byQuoted 8 lines · Christoph Hellwig
Hi all,
this series started by trying to remove
xfs_attr_shortformas sparse complains about it due using a variable sized array in struct using in a variable sized array. I ended up cleaning a lot more code around it once I started looking into it, including some basic cleanups for the inode fork inline data memory management (I'll have another series for more work there at a later time).
Series looks good now.
Signature · 2 lines
Dave Chinner [email protected]