| Message ID | 20200430225016.4287-19-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: Delay Ready Attributes | expand |
On Thu, Apr 30, 2020 at 03:50:10PM -0700, Allison Collins wrote: > This patch adds another new helper function > xfs_attr_node_removename_rmt. This will also help modularize > xfs_attr_node_removename when we add delay ready attributes later. > > Signed-off-by: Allison Collins <allison.henderson@oracle.com> > Reviewed-by: Brian Foster <bfoster@redhat.com> > Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com> > --- > fs/xfs/libxfs/xfs_attr.c | 28 +++++++++++++++++++--------- > 1 file changed, 19 insertions(+), 9 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index c8226c6..ab1c9fa 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -1216,6 +1216,24 @@ int xfs_attr_node_removename_setup( > return 0; > } > > +STATIC int > +xfs_attr_node_removename_rmt ( xfs_attr_node_remove_rmt? Otherwise looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > + struct xfs_da_args *args, > + struct xfs_da_state *state) > +{ > + int error = 0; > + > + error = xfs_attr_rmtval_remove(args); > + if (error) > + return error; > + > + /* > + * Refill the state structure with buffers, the prior calls released our > + * buffers. > + */ > + return xfs_attr_refillstate(state); > +} > + > /* > * Remove a name from a B-tree attribute list. > * > @@ -1244,15 +1262,7 @@ xfs_attr_node_removename( > * overflow the maximum size of a transaction and/or hit a deadlock. > */ > if (args->rmtblkno > 0) { > - error = xfs_attr_rmtval_remove(args); > - if (error) > - goto out; > - > - /* > - * Refill the state structure with buffers, the prior calls > - * released our buffers. > - */ > - error = xfs_attr_refillstate(state); > + error = xfs_attr_node_removename_rmt(args, state); > if (error) > goto out; > } > -- > 2.7.4 >
On 5/4/20 12:00 PM, Darrick J. Wong wrote: > On Thu, Apr 30, 2020 at 03:50:10PM -0700, Allison Collins wrote: >> This patch adds another new helper function >> xfs_attr_node_removename_rmt. This will also help modularize >> xfs_attr_node_removename when we add delay ready attributes later. >> >> Signed-off-by: Allison Collins <allison.henderson@oracle.com> >> Reviewed-by: Brian Foster <bfoster@redhat.com> >> Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com> >> --- >> fs/xfs/libxfs/xfs_attr.c | 28 +++++++++++++++++++--------- >> 1 file changed, 19 insertions(+), 9 deletions(-) >> >> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c >> index c8226c6..ab1c9fa 100644 >> --- a/fs/xfs/libxfs/xfs_attr.c >> +++ b/fs/xfs/libxfs/xfs_attr.c >> @@ -1216,6 +1216,24 @@ int xfs_attr_node_removename_setup( >> return 0; >> } >> >> +STATIC int >> +xfs_attr_node_removename_rmt ( > > xfs_attr_node_remove_rmt? I believe this is a name Brian had asked for in a prior review, though I don't know how firmly set he is on it? > > Otherwise looks ok, > Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Alrighty, thank you! Allison > > --D > >> + struct xfs_da_args *args, >> + struct xfs_da_state *state) >> +{ >> + int error = 0; >> + >> + error = xfs_attr_rmtval_remove(args); >> + if (error) >> + return error; >> + >> + /* >> + * Refill the state structure with buffers, the prior calls released our >> + * buffers. >> + */ >> + return xfs_attr_refillstate(state); >> +} >> + >> /* >> * Remove a name from a B-tree attribute list. >> * >> @@ -1244,15 +1262,7 @@ xfs_attr_node_removename( >> * overflow the maximum size of a transaction and/or hit a deadlock. >> */ >> if (args->rmtblkno > 0) { >> - error = xfs_attr_rmtval_remove(args); >> - if (error) >> - goto out; >> - >> - /* >> - * Refill the state structure with buffers, the prior calls >> - * released our buffers. >> - */ >> - error = xfs_attr_refillstate(state); >> + error = xfs_attr_node_removename_rmt(args, state); >> if (error) >> goto out; >> } >> -- >> 2.7.4 >>
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index c8226c6..ab1c9fa 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -1216,6 +1216,24 @@ int xfs_attr_node_removename_setup( return 0; } +STATIC int +xfs_attr_node_removename_rmt ( + struct xfs_da_args *args, + struct xfs_da_state *state) +{ + int error = 0; + + error = xfs_attr_rmtval_remove(args); + if (error) + return error; + + /* + * Refill the state structure with buffers, the prior calls released our + * buffers. + */ + return xfs_attr_refillstate(state); +} + /* * Remove a name from a B-tree attribute list. * @@ -1244,15 +1262,7 @@ xfs_attr_node_removename( * overflow the maximum size of a transaction and/or hit a deadlock. */ if (args->rmtblkno > 0) { - error = xfs_attr_rmtval_remove(args); - if (error) - goto out; - - /* - * Refill the state structure with buffers, the prior calls - * released our buffers. - */ - error = xfs_attr_refillstate(state); + error = xfs_attr_node_removename_rmt(args, state); if (error) goto out; }