| Message ID | 20191212041513.13855-5-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: Delay Ready Attributes | expand |
On Wed, Dec 11, 2019 at 09:15:03PM -0700, Allison Collins wrote: > From: Allison Henderson <allison.henderson@oracle.com> > > This patch adds a new functions to check for the existence of > an attribute. Subroutines are also added to handle the cases > of leaf blocks, nodes or shortform. Common code that appears > in existing attr add and remove functions have been factored > out to help reduce the appearance of duplicated code. We will > need these routines later for delayed attributes since delayed > operations cannot return error codes. > > Signed-off-by: Allison Collins <allison.henderson@oracle.com> > --- > fs/xfs/libxfs/xfs_attr.c | 166 +++++++++++++++++++++++++++--------------- > fs/xfs/libxfs/xfs_attr.h | 1 + > fs/xfs/libxfs/xfs_attr_leaf.c | 110 +++++++++++++++++----------- > fs/xfs/libxfs/xfs_attr_leaf.h | 3 + > 4 files changed, 182 insertions(+), 98 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index 9628ed8..88de43c 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c ... > @@ -310,6 +313,36 @@ xfs_attr_set_args( > } > > /* > + * Return EEXIST if attr is found, or ENOATTR if not > + */ > +int > +xfs_has_attr( > + struct xfs_da_args *args) > +{ > + struct xfs_inode *dp = args->dp; > + > + if (!xfs_inode_hasattr(dp)) > + return -ENOATTR; > + > + if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) { > + ASSERT(dp->i_afp->if_flags & XFS_IFINLINE); > + return xfs_attr_sf_findname(args, NULL, NULL); > + } > + > + if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) { > + struct xfs_buf *bp = NULL; > + int error = xfs_attr_leaf_hasname(args, &bp); > + I'd prefer to not obfuscate function calls in variable declarations like this. I'd say just declare bp and error at the top and let this be: error = xfs_attr_leaf_hasname(...) > + if (bp) > + xfs_trans_brelse(args->trans, bp); > + > + return error; > + } > + > + return xfs_attr_node_hasname(args, NULL); > +} > + > +/* > * Remove the attribute specified in @args. > */ > int > @@ -583,26 +616,20 @@ STATIC int > xfs_attr_leaf_addname( > struct xfs_da_args *args) > { > - struct xfs_inode *dp; > struct xfs_buf *bp; > int retval, error, forkoff; > + struct xfs_inode *dp = args->dp; > > trace_xfs_attr_leaf_addname(args); > > /* > - * Read the (only) block in the attribute list in. > - */ > - dp = args->dp; > - args->blkno = 0; > - error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp); > - if (error) > - return error; > - > - /* > * Look up the given attribute in the leaf block. Figure out if > * the given flags produce an error or call for an atomic rename. > */ > - retval = xfs_attr3_leaf_lookup_int(bp, args); > + retval = xfs_attr_leaf_hasname(args, &bp); > + if (retval != -ENOATTR && retval != -EEXIST) > + return retval; > + Do we need to call xfs_trans_brelse() in certain cases before we return? For example, consider if the read succeeds but the lookup returns something other than -ENOATTR or -EEXIST. Perhaps the _hasname() func should just call brelse() itself if it's returning an unexpected error after reading in the buf so the caller doesn't need to care about it.. > if ((args->name.type & ATTR_REPLACE) && (retval == -ENOATTR)) { > xfs_trans_brelse(args->trans, bp); > return retval; ... > @@ -864,20 +940,17 @@ xfs_attr_node_addname( > dp = args->dp; > mp = dp->i_mount; > restart: > - state = xfs_da_state_alloc(); > - state->args = args; > - state->mp = mp; > - > /* > * Search to see if name already exists, and get back a pointer > * to where it should go. > */ > - error = xfs_da3_node_lookup_int(state, &retval); > - if (error) > + retval = xfs_attr_node_hasname(args, &state); > + if (retval != -ENOATTR) > goto out; The else case below checks for -EEXIST, but it looks like we'd return here.. Brian > + > blk = &state->path.blk[ state->path.active-1 ]; > ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC); > - if ((args->name.type & ATTR_REPLACE) && (retval == -ENOATTR)) { > + if (args->name.type & ATTR_REPLACE) { > goto out; > } else if (retval == -EEXIST) { > if (args->name.type & ATTR_CREATE) > @@ -1079,29 +1152,15 @@ xfs_attr_node_removename( > { > struct xfs_da_state *state; > struct xfs_da_state_blk *blk; > - struct xfs_inode *dp; > struct xfs_buf *bp; > int retval, error, forkoff; > + struct xfs_inode *dp = args->dp; > > trace_xfs_attr_node_removename(args); > > - /* > - * Tie a string around our finger to remind us where we are. > - */ > - dp = args->dp; > - state = xfs_da_state_alloc(); > - state->args = args; > - state->mp = dp->i_mount; > - > - /* > - * Search to see if name exists, and get back a pointer to it. > - */ > - error = xfs_da3_node_lookup_int(state, &retval); > - if (error || (retval != -EEXIST)) { > - if (error == 0) > - error = retval; > + error = xfs_attr_node_hasname(args, &state); > + if (error != -EEXIST) > goto out; > - } > > /* > * If there is an out-of-line value, de-allocate the blocks. > @@ -1196,7 +1255,8 @@ xfs_attr_node_removename( > error = 0; > > out: > - xfs_da_state_free(state); > + if (state) > + xfs_da_state_free(state); > return error; > } > > @@ -1316,31 +1376,23 @@ xfs_attr_node_get(xfs_da_args_t *args) > { > xfs_da_state_t *state; > xfs_da_state_blk_t *blk; > - int error, retval; > + int error; > int i; > > trace_xfs_attr_node_get(args); > > - state = xfs_da_state_alloc(); > - state->args = args; > - state->mp = args->dp->i_mount; > - > /* > * Search to see if name exists, and get back a pointer to it. > */ > - error = xfs_da3_node_lookup_int(state, &retval); > - if (error) { > - retval = error; > - goto out_release; > - } > - if (retval != -EEXIST) > + error = xfs_attr_node_hasname(args, &state); > + if (error != -EEXIST) > goto out_release; > > /* > * Get the value, local or "remote" > */ > blk = &state->path.blk[state->path.active - 1]; > - retval = xfs_attr3_leaf_getvalue(blk->bp, args); > + error = xfs_attr3_leaf_getvalue(blk->bp, args); > > /* > * If not in a transaction, we have to release all the buffers. > @@ -1352,7 +1404,7 @@ xfs_attr_node_get(xfs_da_args_t *args) > } > > xfs_da_state_free(state); > - return retval; > + return error; > } > > /* Returns true if the attribute entry name is valid. */ > diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h > index 44dd07a..3b5dad4 100644 > --- a/fs/xfs/libxfs/xfs_attr.h > +++ b/fs/xfs/libxfs/xfs_attr.h > @@ -150,6 +150,7 @@ int xfs_attr_set(struct xfs_inode *dp, struct xfs_name *name, > unsigned char *value, int valuelen, int flags); > int xfs_attr_set_args(struct xfs_da_args *args); > int xfs_attr_remove(struct xfs_inode *dp, struct xfs_name *name, int flags); > +int xfs_has_attr(struct xfs_da_args *args); > int xfs_attr_remove_args(struct xfs_da_args *args); > int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize, > int flags, struct attrlist_cursor_kern *cursor); > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index 5465446..ef96971 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -654,18 +654,66 @@ xfs_attr_shortform_create(xfs_da_args_t *args) > } > > /* > + * Return -EEXIST if attr is found, or -ENOATTR if not > + * args: args containing attribute name and namelen > + * sfep: If not null, pointer will be set to the last attr entry found on > + -EEXIST. On -ENOATTR pointer is left at the last entry in the list > + * basep: If not null, pointer is set to the byte offset of the entry in the > + * list on -EEXIST. On -ENOATTR, pointer is left at the byte offset of > + * the last entry in the list > + */ > +int > +xfs_attr_sf_findname( > + struct xfs_da_args *args, > + struct xfs_attr_sf_entry **sfep, > + unsigned int *basep) > +{ > + struct xfs_attr_shortform *sf; > + struct xfs_attr_sf_entry *sfe; > + unsigned int base = sizeof(struct xfs_attr_sf_hdr); > + int size = 0; > + int end; > + int i; > + > + sf = (struct xfs_attr_shortform *)args->dp->i_afp->if_u1.if_data; > + sfe = &sf->list[0]; > + end = sf->hdr.count; > + for (i = 0; i < end; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), > + base += size, i++) { > + size = XFS_ATTR_SF_ENTSIZE(sfe); > + if (sfe->namelen != args->name.len) > + continue; > + if (memcmp(sfe->nameval, args->name.name, args->name.len) != 0) > + continue; > + if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) > + continue; > + break; > + } > + > + if (sfep != NULL) > + *sfep = sfe; > + > + if (basep != NULL) > + *basep = base; > + > + if (i == end) > + return -ENOATTR; > + return -EEXIST; > +} > + > +/* > * Add a name/value pair to the shortform attribute list. > * Overflow from the inode has already been checked for. > */ > void > -xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) > +xfs_attr_shortform_add(struct xfs_da_args *args, int forkoff) > { > - xfs_attr_shortform_t *sf; > - xfs_attr_sf_entry_t *sfe; > - int i, offset, size; > - xfs_mount_t *mp; > - xfs_inode_t *dp; > - struct xfs_ifork *ifp; > + struct xfs_attr_shortform *sf; > + struct xfs_attr_sf_entry *sfe; > + int offset, size, error; > + struct xfs_mount *mp; > + struct xfs_inode *dp; > + struct xfs_ifork *ifp; > > trace_xfs_attr_sf_add(args); > > @@ -676,18 +724,8 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) > ifp = dp->i_afp; > ASSERT(ifp->if_flags & XFS_IFINLINE); > sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data; > - sfe = &sf->list[0]; > - for (i = 0; i < sf->hdr.count; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), i++) { > -#ifdef DEBUG > - if (sfe->namelen != args->name.len) > - continue; > - if (memcmp(args->name.name, sfe->nameval, args->name.len) != 0) > - continue; > - if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) > - continue; > - ASSERT(0); > -#endif > - } > + error = xfs_attr_sf_findname(args, &sfe, NULL); > + ASSERT(error != -EEXIST); > > offset = (char *)sfe - (char *)sf; > size = XFS_ATTR_SF_ENTSIZE_BYNAME(args->name.len, args->valuelen); > @@ -730,35 +768,25 @@ xfs_attr_fork_remove( > * Remove an attribute from the shortform attribute list structure. > */ > int > -xfs_attr_shortform_remove(xfs_da_args_t *args) > +xfs_attr_shortform_remove(struct xfs_da_args *args) > { > - xfs_attr_shortform_t *sf; > - xfs_attr_sf_entry_t *sfe; > - int base, size=0, end, totsize, i; > - xfs_mount_t *mp; > - xfs_inode_t *dp; > + struct xfs_attr_shortform *sf; > + struct xfs_attr_sf_entry *sfe; > + int base, size = 0, end, totsize; > + struct xfs_mount *mp; > + struct xfs_inode *dp; > + int error; > > trace_xfs_attr_sf_remove(args); > > dp = args->dp; > mp = dp->i_mount; > - base = sizeof(xfs_attr_sf_hdr_t); > sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data; > - sfe = &sf->list[0]; > - end = sf->hdr.count; > - for (i = 0; i < end; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), > - base += size, i++) { > - size = XFS_ATTR_SF_ENTSIZE(sfe); > - if (sfe->namelen != args->name.len) > - continue; > - if (memcmp(sfe->nameval, args->name.name, args->name.len) != 0) > - continue; > - if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) > - continue; > - break; > - } > - if (i == end) > - return -ENOATTR; > + > + error = xfs_attr_sf_findname(args, &sfe, &base); > + if (error != -EEXIST) > + return error; > + size = XFS_ATTR_SF_ENTSIZE(sfe); > > /* > * Fix up the attribute fork data, covering the hole > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h > index f4a188e..f6165ff 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.h > +++ b/fs/xfs/libxfs/xfs_attr_leaf.h > @@ -62,6 +62,9 @@ int xfs_attr_shortform_getvalue(struct xfs_da_args *args); > int xfs_attr_shortform_to_leaf(struct xfs_da_args *args, > struct xfs_buf **leaf_bp); > int xfs_attr_shortform_remove(struct xfs_da_args *args); > +int xfs_attr_sf_findname(struct xfs_da_args *args, > + struct xfs_attr_sf_entry **sfep, > + unsigned int *basep); > 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_inode *ip); > -- > 2.7.4 >
On 12/13/19 6:08 AM, Brian Foster wrote: > On Wed, Dec 11, 2019 at 09:15:03PM -0700, Allison Collins wrote: >> From: Allison Henderson <allison.henderson@oracle.com> >> >> This patch adds a new functions to check for the existence of >> an attribute. Subroutines are also added to handle the cases >> of leaf blocks, nodes or shortform. Common code that appears >> in existing attr add and remove functions have been factored >> out to help reduce the appearance of duplicated code. We will >> need these routines later for delayed attributes since delayed >> operations cannot return error codes. >> >> Signed-off-by: Allison Collins <allison.henderson@oracle.com> >> --- >> fs/xfs/libxfs/xfs_attr.c | 166 +++++++++++++++++++++++++++--------------- >> fs/xfs/libxfs/xfs_attr.h | 1 + >> fs/xfs/libxfs/xfs_attr_leaf.c | 110 +++++++++++++++++----------- >> fs/xfs/libxfs/xfs_attr_leaf.h | 3 + >> 4 files changed, 182 insertions(+), 98 deletions(-) >> >> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c >> index 9628ed8..88de43c 100644 >> --- a/fs/xfs/libxfs/xfs_attr.c >> +++ b/fs/xfs/libxfs/xfs_attr.c > ... >> @@ -310,6 +313,36 @@ xfs_attr_set_args( >> } >> >> /* >> + * Return EEXIST if attr is found, or ENOATTR if not >> + */ >> +int >> +xfs_has_attr( >> + struct xfs_da_args *args) >> +{ >> + struct xfs_inode *dp = args->dp; >> + >> + if (!xfs_inode_hasattr(dp)) >> + return -ENOATTR; >> + >> + if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) { >> + ASSERT(dp->i_afp->if_flags & XFS_IFINLINE); >> + return xfs_attr_sf_findname(args, NULL, NULL); >> + } >> + >> + if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) { >> + struct xfs_buf *bp = NULL; >> + int error = xfs_attr_leaf_hasname(args, &bp); >> + > > I'd prefer to not obfuscate function calls in variable declarations like > this. I'd say just declare bp and error at the top and let this be: Sure, this style was a suggestion from Christoph in the last review so I tried to combine everyones requests as best as possible. I'm not very particular about the aesthetics, so I don't mind moving things around, but if people feel strongly one way or another, please chime in. > > error = xfs_attr_leaf_hasname(...) > >> + if (bp) >> + xfs_trans_brelse(args->trans, bp); >> + >> + return error; >> + } >> + >> + return xfs_attr_node_hasname(args, NULL); >> +} >> + >> +/* >> * Remove the attribute specified in @args. >> */ >> int >> @@ -583,26 +616,20 @@ STATIC int >> xfs_attr_leaf_addname( >> struct xfs_da_args *args) >> { >> - struct xfs_inode *dp; >> struct xfs_buf *bp; >> int retval, error, forkoff; >> + struct xfs_inode *dp = args->dp; >> >> trace_xfs_attr_leaf_addname(args); >> >> /* >> - * Read the (only) block in the attribute list in. >> - */ >> - dp = args->dp; >> - args->blkno = 0; >> - error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp); >> - if (error) >> - return error; >> - >> - /* >> * Look up the given attribute in the leaf block. Figure out if >> * the given flags produce an error or call for an atomic rename. >> */ >> - retval = xfs_attr3_leaf_lookup_int(bp, args); >> + retval = xfs_attr_leaf_hasname(args, &bp); >> + if (retval != -ENOATTR && retval != -EEXIST) >> + return retval; >> + > > Do we need to call xfs_trans_brelse() in certain cases before we return? > For example, consider if the read succeeds but the lookup returns > something other than -ENOATTR or -EEXIST. Perhaps the _hasname() func > should just call brelse() itself if it's returning an unexpected error > after reading in the buf so the caller doesn't need to care about it.. Generally it should be released at some point if the call is successful (so on -EEXIST). Later when we get into the state machine, we don't release right away, because we need to hold it across the transaction rolls. I think though I might be able to factor up releasing the buffer on error though. I'll see if I can work that into the next version. > >> if ((args->name.type & ATTR_REPLACE) && (retval == -ENOATTR)) { >> xfs_trans_brelse(args->trans, bp); >> return retval; > ... >> @@ -864,20 +940,17 @@ xfs_attr_node_addname( >> dp = args->dp; >> mp = dp->i_mount; >> restart: >> - state = xfs_da_state_alloc(); >> - state->args = args; >> - state->mp = mp; >> - >> /* >> * Search to see if name already exists, and get back a pointer >> * to where it should go. >> */ >> - error = xfs_da3_node_lookup_int(state, &retval); >> - if (error) >> + retval = xfs_attr_node_hasname(args, &state); >> + if (retval != -ENOATTR) >> goto out; > > The else case below checks for -EEXIST, but it looks like we'd return > here.. > > Brian Ok, will clean out. Thx! Allison > >> + >> blk = &state->path.blk[ state->path.active-1 ]; >> ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC); >> - if ((args->name.type & ATTR_REPLACE) && (retval == -ENOATTR)) { >> + if (args->name.type & ATTR_REPLACE) { >> goto out; >> } else if (retval == -EEXIST) { >> if (args->name.type & ATTR_CREATE) >> @@ -1079,29 +1152,15 @@ xfs_attr_node_removename( >> { >> struct xfs_da_state *state; >> struct xfs_da_state_blk *blk; >> - struct xfs_inode *dp; >> struct xfs_buf *bp; >> int retval, error, forkoff; >> + struct xfs_inode *dp = args->dp; >> >> trace_xfs_attr_node_removename(args); >> >> - /* >> - * Tie a string around our finger to remind us where we are. >> - */ >> - dp = args->dp; >> - state = xfs_da_state_alloc(); >> - state->args = args; >> - state->mp = dp->i_mount; >> - >> - /* >> - * Search to see if name exists, and get back a pointer to it. >> - */ >> - error = xfs_da3_node_lookup_int(state, &retval); >> - if (error || (retval != -EEXIST)) { >> - if (error == 0) >> - error = retval; >> + error = xfs_attr_node_hasname(args, &state); >> + if (error != -EEXIST) >> goto out; >> - } >> >> /* >> * If there is an out-of-line value, de-allocate the blocks. >> @@ -1196,7 +1255,8 @@ xfs_attr_node_removename( >> error = 0; >> >> out: >> - xfs_da_state_free(state); >> + if (state) >> + xfs_da_state_free(state); >> return error; >> } >> >> @@ -1316,31 +1376,23 @@ xfs_attr_node_get(xfs_da_args_t *args) >> { >> xfs_da_state_t *state; >> xfs_da_state_blk_t *blk; >> - int error, retval; >> + int error; >> int i; >> >> trace_xfs_attr_node_get(args); >> >> - state = xfs_da_state_alloc(); >> - state->args = args; >> - state->mp = args->dp->i_mount; >> - >> /* >> * Search to see if name exists, and get back a pointer to it. >> */ >> - error = xfs_da3_node_lookup_int(state, &retval); >> - if (error) { >> - retval = error; >> - goto out_release; >> - } >> - if (retval != -EEXIST) >> + error = xfs_attr_node_hasname(args, &state); >> + if (error != -EEXIST) >> goto out_release; >> >> /* >> * Get the value, local or "remote" >> */ >> blk = &state->path.blk[state->path.active - 1]; >> - retval = xfs_attr3_leaf_getvalue(blk->bp, args); >> + error = xfs_attr3_leaf_getvalue(blk->bp, args); >> >> /* >> * If not in a transaction, we have to release all the buffers. >> @@ -1352,7 +1404,7 @@ xfs_attr_node_get(xfs_da_args_t *args) >> } >> >> xfs_da_state_free(state); >> - return retval; >> + return error; >> } >> >> /* Returns true if the attribute entry name is valid. */ >> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h >> index 44dd07a..3b5dad4 100644 >> --- a/fs/xfs/libxfs/xfs_attr.h >> +++ b/fs/xfs/libxfs/xfs_attr.h >> @@ -150,6 +150,7 @@ int xfs_attr_set(struct xfs_inode *dp, struct xfs_name *name, >> unsigned char *value, int valuelen, int flags); >> int xfs_attr_set_args(struct xfs_da_args *args); >> int xfs_attr_remove(struct xfs_inode *dp, struct xfs_name *name, int flags); >> +int xfs_has_attr(struct xfs_da_args *args); >> int xfs_attr_remove_args(struct xfs_da_args *args); >> int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize, >> int flags, struct attrlist_cursor_kern *cursor); >> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c >> index 5465446..ef96971 100644 >> --- a/fs/xfs/libxfs/xfs_attr_leaf.c >> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c >> @@ -654,18 +654,66 @@ xfs_attr_shortform_create(xfs_da_args_t *args) >> } >> >> /* >> + * Return -EEXIST if attr is found, or -ENOATTR if not >> + * args: args containing attribute name and namelen >> + * sfep: If not null, pointer will be set to the last attr entry found on >> + -EEXIST. On -ENOATTR pointer is left at the last entry in the list >> + * basep: If not null, pointer is set to the byte offset of the entry in the >> + * list on -EEXIST. On -ENOATTR, pointer is left at the byte offset of >> + * the last entry in the list >> + */ >> +int >> +xfs_attr_sf_findname( >> + struct xfs_da_args *args, >> + struct xfs_attr_sf_entry **sfep, >> + unsigned int *basep) >> +{ >> + struct xfs_attr_shortform *sf; >> + struct xfs_attr_sf_entry *sfe; >> + unsigned int base = sizeof(struct xfs_attr_sf_hdr); >> + int size = 0; >> + int end; >> + int i; >> + >> + sf = (struct xfs_attr_shortform *)args->dp->i_afp->if_u1.if_data; >> + sfe = &sf->list[0]; >> + end = sf->hdr.count; >> + for (i = 0; i < end; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), >> + base += size, i++) { >> + size = XFS_ATTR_SF_ENTSIZE(sfe); >> + if (sfe->namelen != args->name.len) >> + continue; >> + if (memcmp(sfe->nameval, args->name.name, args->name.len) != 0) >> + continue; >> + if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) >> + continue; >> + break; >> + } >> + >> + if (sfep != NULL) >> + *sfep = sfe; >> + >> + if (basep != NULL) >> + *basep = base; >> + >> + if (i == end) >> + return -ENOATTR; >> + return -EEXIST; >> +} >> + >> +/* >> * Add a name/value pair to the shortform attribute list. >> * Overflow from the inode has already been checked for. >> */ >> void >> -xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) >> +xfs_attr_shortform_add(struct xfs_da_args *args, int forkoff) >> { >> - xfs_attr_shortform_t *sf; >> - xfs_attr_sf_entry_t *sfe; >> - int i, offset, size; >> - xfs_mount_t *mp; >> - xfs_inode_t *dp; >> - struct xfs_ifork *ifp; >> + struct xfs_attr_shortform *sf; >> + struct xfs_attr_sf_entry *sfe; >> + int offset, size, error; >> + struct xfs_mount *mp; >> + struct xfs_inode *dp; >> + struct xfs_ifork *ifp; >> >> trace_xfs_attr_sf_add(args); >> >> @@ -676,18 +724,8 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) >> ifp = dp->i_afp; >> ASSERT(ifp->if_flags & XFS_IFINLINE); >> sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data; >> - sfe = &sf->list[0]; >> - for (i = 0; i < sf->hdr.count; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), i++) { >> -#ifdef DEBUG >> - if (sfe->namelen != args->name.len) >> - continue; >> - if (memcmp(args->name.name, sfe->nameval, args->name.len) != 0) >> - continue; >> - if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) >> - continue; >> - ASSERT(0); >> -#endif >> - } >> + error = xfs_attr_sf_findname(args, &sfe, NULL); >> + ASSERT(error != -EEXIST); >> >> offset = (char *)sfe - (char *)sf; >> size = XFS_ATTR_SF_ENTSIZE_BYNAME(args->name.len, args->valuelen); >> @@ -730,35 +768,25 @@ xfs_attr_fork_remove( >> * Remove an attribute from the shortform attribute list structure. >> */ >> int >> -xfs_attr_shortform_remove(xfs_da_args_t *args) >> +xfs_attr_shortform_remove(struct xfs_da_args *args) >> { >> - xfs_attr_shortform_t *sf; >> - xfs_attr_sf_entry_t *sfe; >> - int base, size=0, end, totsize, i; >> - xfs_mount_t *mp; >> - xfs_inode_t *dp; >> + struct xfs_attr_shortform *sf; >> + struct xfs_attr_sf_entry *sfe; >> + int base, size = 0, end, totsize; >> + struct xfs_mount *mp; >> + struct xfs_inode *dp; >> + int error; >> >> trace_xfs_attr_sf_remove(args); >> >> dp = args->dp; >> mp = dp->i_mount; >> - base = sizeof(xfs_attr_sf_hdr_t); >> sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data; >> - sfe = &sf->list[0]; >> - end = sf->hdr.count; >> - for (i = 0; i < end; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), >> - base += size, i++) { >> - size = XFS_ATTR_SF_ENTSIZE(sfe); >> - if (sfe->namelen != args->name.len) >> - continue; >> - if (memcmp(sfe->nameval, args->name.name, args->name.len) != 0) >> - continue; >> - if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) >> - continue; >> - break; >> - } >> - if (i == end) >> - return -ENOATTR; >> + >> + error = xfs_attr_sf_findname(args, &sfe, &base); >> + if (error != -EEXIST) >> + return error; >> + size = XFS_ATTR_SF_ENTSIZE(sfe); >> >> /* >> * Fix up the attribute fork data, covering the hole >> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h >> index f4a188e..f6165ff 100644 >> --- a/fs/xfs/libxfs/xfs_attr_leaf.h >> +++ b/fs/xfs/libxfs/xfs_attr_leaf.h >> @@ -62,6 +62,9 @@ int xfs_attr_shortform_getvalue(struct xfs_da_args *args); >> int xfs_attr_shortform_to_leaf(struct xfs_da_args *args, >> struct xfs_buf **leaf_bp); >> int xfs_attr_shortform_remove(struct xfs_da_args *args); >> +int xfs_attr_sf_findname(struct xfs_da_args *args, >> + struct xfs_attr_sf_entry **sfep, >> + unsigned int *basep); >> 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_inode *ip); >> -- >> 2.7.4 >> >
On Wed, Dec 11, 2019 at 09:15:03PM -0700, Allison Collins wrote: > From: Allison Henderson <allison.henderson@oracle.com> > > This patch adds a new functions to check for the existence of > an attribute. Subroutines are also added to handle the cases > of leaf blocks, nodes or shortform. Common code that appears > in existing attr add and remove functions have been factored > out to help reduce the appearance of duplicated code. We will > need these routines later for delayed attributes since delayed > operations cannot return error codes. Can you explain why we need the ahead of time check? The first operation should be able to still return an error, and doing a separate check instead of letting the actual operation fail gracefully is more expensive, and also creates a lot of additional code. As is I can't say I like the direction at all.
On 12/24/19 5:18 AM, Christoph Hellwig wrote: > On Wed, Dec 11, 2019 at 09:15:03PM -0700, Allison Collins wrote: >> From: Allison Henderson <allison.henderson@oracle.com> >> >> This patch adds a new functions to check for the existence of >> an attribute. Subroutines are also added to handle the cases >> of leaf blocks, nodes or shortform. Common code that appears >> in existing attr add and remove functions have been factored >> out to help reduce the appearance of duplicated code. We will >> need these routines later for delayed attributes since delayed >> operations cannot return error codes. > > Can you explain why we need the ahead of time check? The first > operation should be able to still return an error, and doing > a separate check instead of letting the actual operation fail > gracefully is more expensive, and also creates a lot of additional > code. As is I can't say I like the direction at all. > This one I can answer quickly: later when we get into delayed attributes, this will get called from xfs_defer_finish_noroll as part of a .finish_item call back. If these callbacks return anything other than 0 or -EAGAIN, it causes a shutdown. Which is not what we would want for example: when the user tries to rename a non-existent attribute. The error code needs to go back up. So we check for things like that before starting a delayed operation. Hope that helps. Thanks! Allison
On Tue, Dec 24, 2019 at 09:21:49PM -0700, Allison Collins wrote: > On 12/24/19 5:18 AM, Christoph Hellwig wrote: > > On Wed, Dec 11, 2019 at 09:15:03PM -0700, Allison Collins wrote: > > > From: Allison Henderson <allison.henderson@oracle.com> > > > > > > This patch adds a new functions to check for the existence of > > > an attribute. Subroutines are also added to handle the cases > > > of leaf blocks, nodes or shortform. Common code that appears > > > in existing attr add and remove functions have been factored > > > out to help reduce the appearance of duplicated code. We will > > > need these routines later for delayed attributes since delayed > > > operations cannot return error codes. > > > > Can you explain why we need the ahead of time check? The first > > operation should be able to still return an error, and doing > > a separate check instead of letting the actual operation fail > > gracefully is more expensive, and also creates a lot of additional > > code. As is I can't say I like the direction at all. > > > > This one I can answer quickly: later when we get into delayed attributes, > this will get called from xfs_defer_finish_noroll as part of a .finish_item > call back. If these callbacks return anything other than 0 or -EAGAIN, it > causes a shutdown. When does this happen, exactly? Are you saying that during log recovery, we can end up replaying a delayed attr log item that hits ENOATTR/EEXIST somewhere and passes that out, which causes log recovery to fail? > Which is not what we would want for example: when the > user tries to rename a non-existent attribute. The error code needs to go > back up. So we check for things like that before starting a delayed > operation. Hope that helps. Thanks! ...because as far as requests from user programs goes, we should be doing all these precondition checks after allocating a transaction and ILOCKing the inode, so that we can send the error code back to userspace without cancelling a dirty transaction. (I dunno, am I misunderstanding here?) > Allison
On 1/21/20 3:30 PM, Darrick J. Wong wrote: > On Tue, Dec 24, 2019 at 09:21:49PM -0700, Allison Collins wrote: >> On 12/24/19 5:18 AM, Christoph Hellwig wrote: >>> On Wed, Dec 11, 2019 at 09:15:03PM -0700, Allison Collins wrote: >>>> From: Allison Henderson <allison.henderson@oracle.com> >>>> >>>> This patch adds a new functions to check for the existence of >>>> an attribute. Subroutines are also added to handle the cases >>>> of leaf blocks, nodes or shortform. Common code that appears >>>> in existing attr add and remove functions have been factored >>>> out to help reduce the appearance of duplicated code. We will >>>> need these routines later for delayed attributes since delayed >>>> operations cannot return error codes. >>> >>> Can you explain why we need the ahead of time check? The first >>> operation should be able to still return an error, and doing >>> a separate check instead of letting the actual operation fail >>> gracefully is more expensive, and also creates a lot of additional >>> code. As is I can't say I like the direction at all. >>> >> >> This one I can answer quickly: later when we get into delayed attributes, >> this will get called from xfs_defer_finish_noroll as part of a .finish_item >> call back. If these callbacks return anything other than 0 or -EAGAIN, it >> causes a shutdown. > > When does this happen, exactly? Sure, lets take a look at fs/xfs/libxfs/xfs_defer.c line 399 We have the callback invocation: error = ops->finish_item(*tp, li, dfp->dfp_done, &state); This is where the intent items get to finish out their operations. If they return -EAGAIN, they get get put back in the list, but if they error out, we jump to the error handler (line 445), where we abort the transaction and do a shutdown. Now, if we peek ahead at the first patch that belongs to the next delayed attribute series: https://github.com/allisonhenderson/xfs_work/commit/7d5b7395fe3b1df7739089c0643e20b09de2e0b0 If you expand the diff for fs/xfs/xfs_attr_item.c, and zip down to line 269, you'll see a ".finish_item = xfs_attr_finish_item". This callback will do some leg work to unwrap the log item and feed the appropriate parameters back into xfs_attr_set_iter. So this is why we go through all the trouble to check for any expected errors ahead of time. Are you saying that during log > recovery, we can end up replaying a delayed attr log item that hits > ENOATTR/EEXIST somewhere and passes that out, which causes log recovery > to fail? Well, the idea is to avoid that with this helper function. Reading ahead, it looks like you've already connected the two :-) > >> Which is not what we would want for example: when the >> user tries to rename a non-existent attribute. The error code needs to go >> back up. So we check for things like that before starting a delayed >> operation. Hope that helps. Thanks! > > ...because as far as requests from user programs goes, we should be > doing all these precondition checks after allocating a transaction and > ILOCKing the inode, so that we can send the error code back to userspace > without cancelling a dirty transaction. Yes, we do that later in the set, but I think you've got it ;-) Allison > > (I dunno, am I misunderstanding here?) > >> Allison
I was thinking of adapting this patch to be part of a 3 patch series including one of Chistophs. Something like this: [PATCH v6 11/16] xfs: Check for -ENOATTR or -EEXIST [PATCH v6 03/16] xfs: Add xfs_has_attr and subroutines [PATCH 02/29] xfs: merge xfs_attr_remove into xfs_attr_set What would people think of that? I figured this would be better than the two of us bombarding the mailing list with giant conflicting sets? Also, was I able to answer everyones questions on this patch? Thanks! Allison On 1/21/20 5:25 PM, Allison Collins wrote: > > > On 1/21/20 3:30 PM, Darrick J. Wong wrote: >> On Tue, Dec 24, 2019 at 09:21:49PM -0700, Allison Collins wrote: >>> On 12/24/19 5:18 AM, Christoph Hellwig wrote: >>>> On Wed, Dec 11, 2019 at 09:15:03PM -0700, Allison Collins wrote: >>>>> From: Allison Henderson <allison.henderson@oracle.com> >>>>> >>>>> This patch adds a new functions to check for the existence of >>>>> an attribute. Subroutines are also added to handle the cases >>>>> of leaf blocks, nodes or shortform. Common code that appears >>>>> in existing attr add and remove functions have been factored >>>>> out to help reduce the appearance of duplicated code. We will >>>>> need these routines later for delayed attributes since delayed >>>>> operations cannot return error codes. >>>> >>>> Can you explain why we need the ahead of time check? The first >>>> operation should be able to still return an error, and doing >>>> a separate check instead of letting the actual operation fail >>>> gracefully is more expensive, and also creates a lot of additional >>>> code. As is I can't say I like the direction at all. >>>> >>> >>> This one I can answer quickly: later when we get into delayed >>> attributes, >>> this will get called from xfs_defer_finish_noroll as part of a >>> .finish_item >>> call back. If these callbacks return anything other than 0 or >>> -EAGAIN, it >>> causes a shutdown. >> >> When does this happen, exactly? > > Sure, lets take a look at fs/xfs/libxfs/xfs_defer.c line 399 > We have the callback invocation: > error = ops->finish_item(*tp, li, dfp->dfp_done, &state); > > This is where the intent items get to finish out their operations. If > they return -EAGAIN, they get get put back in the list, but if they > error out, we jump to the error handler (line 445), where we abort the > transaction and do a shutdown. > > > Now, if we peek ahead at the first patch that belongs to the next > delayed attribute series: > > https://github.com/allisonhenderson/xfs_work/commit/7d5b7395fe3b1df7739089c0643e20b09de2e0b0 > > > If you expand the diff for fs/xfs/xfs_attr_item.c, and zip down to line > 269, you'll see a ".finish_item = xfs_attr_finish_item". This > callback will do some leg work to unwrap the log item and feed the > appropriate parameters back into xfs_attr_set_iter. So this is why we > go through all the trouble to check for any expected errors ahead of time. > > > Are you saying that during log >> recovery, we can end up replaying a delayed attr log item that hits >> ENOATTR/EEXIST somewhere and passes that out, which causes log recovery >> to fail? > Well, the idea is to avoid that with this helper function. Reading > ahead, it looks like you've already connected the two :-) > >> >>> Which is not what we would want for example: when the >>> user tries to rename a non-existent attribute. The error code needs >>> to go >>> back up. So we check for things like that before starting a delayed >>> operation. Hope that helps. Thanks! >> >> ...because as far as requests from user programs goes, we should be >> doing all these precondition checks after allocating a transaction and >> ILOCKing the inode, so that we can send the error code back to userspace >> without cancelling a dirty transaction. > Yes, we do that later in the set, but I think you've got it ;-) > > Allison > >> >> (I dunno, am I misunderstanding here?) >> >>> Allison
On Sat, Jan 25, 2020 at 09:27:39AM -0700, Allison Collins wrote: > I was thinking of adapting this patch to be part of a 3 patch series > including one of Chistophs. Something like this: > > [PATCH v6 11/16] xfs: Check for -ENOATTR or -EEXIST > [PATCH v6 03/16] xfs: Add xfs_has_attr and subroutines > [PATCH 02/29] xfs: merge xfs_attr_remove into xfs_attr_set > > What would people think of that? I figured this would be better than the > two of us bombarding the mailing list with giant conflicting sets? Also, was > I able to answer everyones questions on this patch? I'm still not sold at all on this series. It adds a lot of code and makes it much harder to understand. So I'd much rather go back and figuring out how we can do delayed attrs in a more streamlined way. The has_attr and co changes are some of exactly that kind of logic that is just making things worse in the standalone patch set, so even if we must end up with it they absolutely belong into a series actually adding functionality, as they have no use on their own. Independent of that we'll need to clean up the flags mess, so I'd rather just go ahead with that for now.
On 1/25/20 4:08 PM, Christoph Hellwig wrote: > On Sat, Jan 25, 2020 at 09:27:39AM -0700, Allison Collins wrote: >> I was thinking of adapting this patch to be part of a 3 patch series >> including one of Chistophs. Something like this: >> >> [PATCH v6 11/16] xfs: Check for -ENOATTR or -EEXIST >> [PATCH v6 03/16] xfs: Add xfs_has_attr and subroutines >> [PATCH 02/29] xfs: merge xfs_attr_remove into xfs_attr_set >> >> What would people think of that? I figured this would be better than the >> two of us bombarding the mailing list with giant conflicting sets? Also, was >> I able to answer everyones questions on this patch? > > I'm still not sold at all on this series. It adds a lot of code and > makes it much harder to understand. So I'd much rather go back and > figuring out how we can do delayed attrs in a more streamlined way. I had something like that quite a long time ago. Instead of the EAGAIN ping pong, we had a boolean that just sort of turned the transactions off in the delayed attrs path: https://www.spinics.net/lists/linux-xfs/msg18114.html The trouble with this is that it creates one large transaction rather than breaking them up. So while the new method is a lot more complex, it seemed to be the direction folks preferred. > The has_attr and co changes are some of exactly that kind of logic > that is just making things worse in the standalone patch set, so even > if we must end up with it they absolutely belong into a series actually > adding functionality, as they have no use on their own. > Well, in an earlier discussion though we had come together with a plan of implementing the new feature through a series of sub sets. First of which being pure refactor with no functional change. https://www.spinics.net/lists/linux-xfs/msg32035.html I do try to keep the extended set up to date though. Mostly for my own sanity and to make sure things are still on track for the long term goals we are aiming for. > Independent of that we'll need to clean up the flags mess, so I'd rather > just go ahead with that for now. >
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 9628ed8..88de43c 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -46,6 +46,7 @@ STATIC int xfs_attr_shortform_addname(xfs_da_args_t *args); STATIC int xfs_attr_leaf_get(xfs_da_args_t *args); STATIC int xfs_attr_leaf_addname(xfs_da_args_t *args); STATIC int xfs_attr_leaf_removename(xfs_da_args_t *args); +STATIC int xfs_attr_leaf_hasname(struct xfs_da_args *args, struct xfs_buf **bp); /* * Internal routines when attribute list is more than one block. @@ -53,6 +54,8 @@ STATIC int xfs_attr_leaf_removename(xfs_da_args_t *args); STATIC int xfs_attr_node_get(xfs_da_args_t *args); STATIC int xfs_attr_node_addname(xfs_da_args_t *args); STATIC int xfs_attr_node_removename(xfs_da_args_t *args); +STATIC int xfs_attr_node_hasname(xfs_da_args_t *args, + struct xfs_da_state **state); STATIC int xfs_attr_fillstate(xfs_da_state_t *state); STATIC int xfs_attr_refillstate(xfs_da_state_t *state); @@ -310,6 +313,36 @@ xfs_attr_set_args( } /* + * Return EEXIST if attr is found, or ENOATTR if not + */ +int +xfs_has_attr( + struct xfs_da_args *args) +{ + struct xfs_inode *dp = args->dp; + + if (!xfs_inode_hasattr(dp)) + return -ENOATTR; + + if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) { + ASSERT(dp->i_afp->if_flags & XFS_IFINLINE); + return xfs_attr_sf_findname(args, NULL, NULL); + } + + if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) { + struct xfs_buf *bp = NULL; + int error = xfs_attr_leaf_hasname(args, &bp); + + if (bp) + xfs_trans_brelse(args->trans, bp); + + return error; + } + + return xfs_attr_node_hasname(args, NULL); +} + +/* * Remove the attribute specified in @args. */ int @@ -583,26 +616,20 @@ STATIC int xfs_attr_leaf_addname( struct xfs_da_args *args) { - struct xfs_inode *dp; struct xfs_buf *bp; int retval, error, forkoff; + struct xfs_inode *dp = args->dp; trace_xfs_attr_leaf_addname(args); /* - * Read the (only) block in the attribute list in. - */ - dp = args->dp; - args->blkno = 0; - error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp); - if (error) - return error; - - /* * Look up the given attribute in the leaf block. Figure out if * the given flags produce an error or call for an atomic rename. */ - retval = xfs_attr3_leaf_lookup_int(bp, args); + retval = xfs_attr_leaf_hasname(args, &bp); + if (retval != -ENOATTR && retval != -EEXIST) + return retval; + if ((args->name.type & ATTR_REPLACE) && (retval == -ENOATTR)) { xfs_trans_brelse(args->trans, bp); return retval; @@ -754,6 +781,23 @@ xfs_attr_leaf_addname( } /* + * Return EEXIST if attr is found, or ENOATTR if not + */ +STATIC int +xfs_attr_leaf_hasname( + struct xfs_da_args *args, + struct xfs_buf **bp) +{ + int error = 0; + + error = xfs_attr3_leaf_read(args->trans, args->dp, 0, bp); + if (error) + return error; + + return xfs_attr3_leaf_lookup_int(*bp, args); +} + +/* * Remove a name from the leaf attribute list structure * * This leaf block cannot have a "remote" value, we only call this routine @@ -773,12 +817,11 @@ xfs_attr_leaf_removename( * Remove the attribute. */ dp = args->dp; - args->blkno = 0; - error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp); - if (error) + + error = xfs_attr_leaf_hasname(args, &bp); + if (error != -ENOATTR && error != -EEXIST) return error; - error = xfs_attr3_leaf_lookup_int(bp, args); if (error == -ENOATTR) { xfs_trans_brelse(args->trans, bp); return error; @@ -817,12 +860,10 @@ xfs_attr_leaf_get(xfs_da_args_t *args) trace_xfs_attr_leaf_get(args); - args->blkno = 0; - error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp); - if (error) + error = xfs_attr_leaf_hasname(args, &bp); + if (error != -ENOATTR && error != -EEXIST) return error; - error = xfs_attr3_leaf_lookup_int(bp, args); if (error != -EEXIST) { xfs_trans_brelse(args->trans, bp); return error; @@ -832,6 +873,41 @@ xfs_attr_leaf_get(xfs_da_args_t *args) return error; } +/* + * Return EEXIST if attr is found, or ENOATTR if not + * statep: If not null is set to point at the found state. Caller will + * be responsible for freeing the state in this case. + */ +STATIC int +xfs_attr_node_hasname( + struct xfs_da_args *args, + struct xfs_da_state **statep) +{ + struct xfs_da_state *state; + int retval, error; + + state = xfs_da_state_alloc(); + state->args = args; + state->mp = args->dp->i_mount; + + if (statep != NULL) + *statep = NULL; + + /* + * Search to see if name exists, and get back a pointer to it. + */ + error = xfs_da3_node_lookup_int(state, &retval); + if (error == 0) { + if (statep != NULL) + *statep = state; + return retval; + } + + xfs_da_state_free(state); + + return error; +} + /*======================================================================== * External routines when attribute list size > geo->blksize *========================================================================*/ @@ -864,20 +940,17 @@ xfs_attr_node_addname( dp = args->dp; mp = dp->i_mount; restart: - state = xfs_da_state_alloc(); - state->args = args; - state->mp = mp; - /* * Search to see if name already exists, and get back a pointer * to where it should go. */ - error = xfs_da3_node_lookup_int(state, &retval); - if (error) + retval = xfs_attr_node_hasname(args, &state); + if (retval != -ENOATTR) goto out; + blk = &state->path.blk[ state->path.active-1 ]; ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC); - if ((args->name.type & ATTR_REPLACE) && (retval == -ENOATTR)) { + if (args->name.type & ATTR_REPLACE) { goto out; } else if (retval == -EEXIST) { if (args->name.type & ATTR_CREATE) @@ -1079,29 +1152,15 @@ xfs_attr_node_removename( { struct xfs_da_state *state; struct xfs_da_state_blk *blk; - struct xfs_inode *dp; struct xfs_buf *bp; int retval, error, forkoff; + struct xfs_inode *dp = args->dp; trace_xfs_attr_node_removename(args); - /* - * Tie a string around our finger to remind us where we are. - */ - dp = args->dp; - state = xfs_da_state_alloc(); - state->args = args; - state->mp = dp->i_mount; - - /* - * Search to see if name exists, and get back a pointer to it. - */ - error = xfs_da3_node_lookup_int(state, &retval); - if (error || (retval != -EEXIST)) { - if (error == 0) - error = retval; + error = xfs_attr_node_hasname(args, &state); + if (error != -EEXIST) goto out; - } /* * If there is an out-of-line value, de-allocate the blocks. @@ -1196,7 +1255,8 @@ xfs_attr_node_removename( error = 0; out: - xfs_da_state_free(state); + if (state) + xfs_da_state_free(state); return error; } @@ -1316,31 +1376,23 @@ xfs_attr_node_get(xfs_da_args_t *args) { xfs_da_state_t *state; xfs_da_state_blk_t *blk; - int error, retval; + int error; int i; trace_xfs_attr_node_get(args); - state = xfs_da_state_alloc(); - state->args = args; - state->mp = args->dp->i_mount; - /* * Search to see if name exists, and get back a pointer to it. */ - error = xfs_da3_node_lookup_int(state, &retval); - if (error) { - retval = error; - goto out_release; - } - if (retval != -EEXIST) + error = xfs_attr_node_hasname(args, &state); + if (error != -EEXIST) goto out_release; /* * Get the value, local or "remote" */ blk = &state->path.blk[state->path.active - 1]; - retval = xfs_attr3_leaf_getvalue(blk->bp, args); + error = xfs_attr3_leaf_getvalue(blk->bp, args); /* * If not in a transaction, we have to release all the buffers. @@ -1352,7 +1404,7 @@ xfs_attr_node_get(xfs_da_args_t *args) } xfs_da_state_free(state); - return retval; + return error; } /* Returns true if the attribute entry name is valid. */ diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index 44dd07a..3b5dad4 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -150,6 +150,7 @@ int xfs_attr_set(struct xfs_inode *dp, struct xfs_name *name, unsigned char *value, int valuelen, int flags); int xfs_attr_set_args(struct xfs_da_args *args); int xfs_attr_remove(struct xfs_inode *dp, struct xfs_name *name, int flags); +int xfs_has_attr(struct xfs_da_args *args); int xfs_attr_remove_args(struct xfs_da_args *args); int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize, int flags, struct attrlist_cursor_kern *cursor); diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 5465446..ef96971 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -654,18 +654,66 @@ xfs_attr_shortform_create(xfs_da_args_t *args) } /* + * Return -EEXIST if attr is found, or -ENOATTR if not + * args: args containing attribute name and namelen + * sfep: If not null, pointer will be set to the last attr entry found on + -EEXIST. On -ENOATTR pointer is left at the last entry in the list + * basep: If not null, pointer is set to the byte offset of the entry in the + * list on -EEXIST. On -ENOATTR, pointer is left at the byte offset of + * the last entry in the list + */ +int +xfs_attr_sf_findname( + struct xfs_da_args *args, + struct xfs_attr_sf_entry **sfep, + unsigned int *basep) +{ + struct xfs_attr_shortform *sf; + struct xfs_attr_sf_entry *sfe; + unsigned int base = sizeof(struct xfs_attr_sf_hdr); + int size = 0; + int end; + int i; + + sf = (struct xfs_attr_shortform *)args->dp->i_afp->if_u1.if_data; + sfe = &sf->list[0]; + end = sf->hdr.count; + for (i = 0; i < end; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), + base += size, i++) { + size = XFS_ATTR_SF_ENTSIZE(sfe); + if (sfe->namelen != args->name.len) + continue; + if (memcmp(sfe->nameval, args->name.name, args->name.len) != 0) + continue; + if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) + continue; + break; + } + + if (sfep != NULL) + *sfep = sfe; + + if (basep != NULL) + *basep = base; + + if (i == end) + return -ENOATTR; + return -EEXIST; +} + +/* * Add a name/value pair to the shortform attribute list. * Overflow from the inode has already been checked for. */ void -xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) +xfs_attr_shortform_add(struct xfs_da_args *args, int forkoff) { - xfs_attr_shortform_t *sf; - xfs_attr_sf_entry_t *sfe; - int i, offset, size; - xfs_mount_t *mp; - xfs_inode_t *dp; - struct xfs_ifork *ifp; + struct xfs_attr_shortform *sf; + struct xfs_attr_sf_entry *sfe; + int offset, size, error; + struct xfs_mount *mp; + struct xfs_inode *dp; + struct xfs_ifork *ifp; trace_xfs_attr_sf_add(args); @@ -676,18 +724,8 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) ifp = dp->i_afp; ASSERT(ifp->if_flags & XFS_IFINLINE); sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data; - sfe = &sf->list[0]; - for (i = 0; i < sf->hdr.count; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), i++) { -#ifdef DEBUG - if (sfe->namelen != args->name.len) - continue; - if (memcmp(args->name.name, sfe->nameval, args->name.len) != 0) - continue; - if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) - continue; - ASSERT(0); -#endif - } + error = xfs_attr_sf_findname(args, &sfe, NULL); + ASSERT(error != -EEXIST); offset = (char *)sfe - (char *)sf; size = XFS_ATTR_SF_ENTSIZE_BYNAME(args->name.len, args->valuelen); @@ -730,35 +768,25 @@ xfs_attr_fork_remove( * Remove an attribute from the shortform attribute list structure. */ int -xfs_attr_shortform_remove(xfs_da_args_t *args) +xfs_attr_shortform_remove(struct xfs_da_args *args) { - xfs_attr_shortform_t *sf; - xfs_attr_sf_entry_t *sfe; - int base, size=0, end, totsize, i; - xfs_mount_t *mp; - xfs_inode_t *dp; + struct xfs_attr_shortform *sf; + struct xfs_attr_sf_entry *sfe; + int base, size = 0, end, totsize; + struct xfs_mount *mp; + struct xfs_inode *dp; + int error; trace_xfs_attr_sf_remove(args); dp = args->dp; mp = dp->i_mount; - base = sizeof(xfs_attr_sf_hdr_t); sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data; - sfe = &sf->list[0]; - end = sf->hdr.count; - for (i = 0; i < end; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), - base += size, i++) { - size = XFS_ATTR_SF_ENTSIZE(sfe); - if (sfe->namelen != args->name.len) - continue; - if (memcmp(sfe->nameval, args->name.name, args->name.len) != 0) - continue; - if (!xfs_attr_namesp_match(args->name.type, sfe->flags)) - continue; - break; - } - if (i == end) - return -ENOATTR; + + error = xfs_attr_sf_findname(args, &sfe, &base); + if (error != -EEXIST) + return error; + size = XFS_ATTR_SF_ENTSIZE(sfe); /* * Fix up the attribute fork data, covering the hole diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h index f4a188e..f6165ff 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.h +++ b/fs/xfs/libxfs/xfs_attr_leaf.h @@ -62,6 +62,9 @@ int xfs_attr_shortform_getvalue(struct xfs_da_args *args); int xfs_attr_shortform_to_leaf(struct xfs_da_args *args, struct xfs_buf **leaf_bp); int xfs_attr_shortform_remove(struct xfs_da_args *args); +int xfs_attr_sf_findname(struct xfs_da_args *args, + struct xfs_attr_sf_entry **sfep, + unsigned int *basep); 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_inode *ip);