| Message ID | 20190905221837.17388-12-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Delayed Attributes | expand |
On Thu, Sep 05, 2019 at 03:18:29PM -0700, Allison Collins wrote: > Because new delayed attribute routines cannot roll > transactions, we carve off the parts of > xfs_attr_rmtval_remove that we can use. This will help to > reduce repetitive code later when we introduce delayed > attributes. > > Signed-off-by: Allison Collins <allison.henderson@oracle.com> > --- > fs/xfs/libxfs/xfs_attr_remote.c | 29 +++++++++++++++++++++-------- > fs/xfs/libxfs/xfs_attr_remote.h | 1 + > 2 files changed, 22 insertions(+), 8 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c > index 080a284..1b13795 100644 > --- a/fs/xfs/libxfs/xfs_attr_remote.c > +++ b/fs/xfs/libxfs/xfs_attr_remote.c ... > @@ -645,7 +638,27 @@ xfs_attr_rmtval_remove( > lblkno += map.br_blockcount; > blkcnt -= map.br_blockcount; > } > + return 0; > +} > > +/* > + * Remove the value associated with an attribute by deleting the > + * out-of-line buffer that it is stored on. > + */ > +int > +xfs_attr_rmtval_remove( > + struct xfs_da_args *args) > +{ > + xfs_dablk_t lblkno; > + int blkcnt; > + int error = 0; > + int done = 0; Nit: with done initialized here, you can remove the done = 0 further down in the function. That aside: Reviewed-by: Brian Foster <bfoster@redhat.com> > + > + trace_xfs_attr_rmtval_remove(args); > + > + error = xfs_attr_rmtval_invalidate(args); > + if (error) > + return error; > /* > * Keep de-allocating extents until the remote-value region is gone. > */ > diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h > index cd7670d..b6fd35a 100644 > --- a/fs/xfs/libxfs/xfs_attr_remote.h > +++ b/fs/xfs/libxfs/xfs_attr_remote.h > @@ -11,6 +11,7 @@ int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen); > int xfs_attr_rmtval_get(struct xfs_da_args *args); > int xfs_attr_rmtval_set(struct xfs_da_args *args); > int xfs_attr_rmtval_remove(struct xfs_da_args *args); > +int xfs_attr_rmtval_invalidate(struct xfs_da_args *args); > int xfs_attr_rmtval_set_value(struct xfs_da_args *args); > int xfs_attr_rmt_find_hole(struct xfs_da_args *args); > #endif /* __XFS_ATTR_REMOTE_H__ */ > -- > 2.7.4 >
On 9/20/19 6:51 AM, Brian Foster wrote: > On Thu, Sep 05, 2019 at 03:18:29PM -0700, Allison Collins wrote: >> Because new delayed attribute routines cannot roll >> transactions, we carve off the parts of >> xfs_attr_rmtval_remove that we can use. This will help to >> reduce repetitive code later when we introduce delayed >> attributes. >> >> Signed-off-by: Allison Collins <allison.henderson@oracle.com> >> --- >> fs/xfs/libxfs/xfs_attr_remote.c | 29 +++++++++++++++++++++-------- >> fs/xfs/libxfs/xfs_attr_remote.h | 1 + >> 2 files changed, 22 insertions(+), 8 deletions(-) >> >> diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c >> index 080a284..1b13795 100644 >> --- a/fs/xfs/libxfs/xfs_attr_remote.c >> +++ b/fs/xfs/libxfs/xfs_attr_remote.c > ... >> @@ -645,7 +638,27 @@ xfs_attr_rmtval_remove( >> lblkno += map.br_blockcount; >> blkcnt -= map.br_blockcount; >> } >> + return 0; >> +} >> >> +/* >> + * Remove the value associated with an attribute by deleting the >> + * out-of-line buffer that it is stored on. >> + */ >> +int >> +xfs_attr_rmtval_remove( >> + struct xfs_da_args *args) >> +{ >> + xfs_dablk_t lblkno; >> + int blkcnt; >> + int error = 0; >> + int done = 0; > > Nit: with done initialized here, you can remove the done = 0 further > down in the function. That aside: > > Reviewed-by: Brian Foster <bfoster@redhat.com> Ok, I will pick out that little bit. Thank you for the reviews! Allison > >> + >> + trace_xfs_attr_rmtval_remove(args); >> + >> + error = xfs_attr_rmtval_invalidate(args); >> + if (error) >> + return error; >> /* >> * Keep de-allocating extents until the remote-value region is gone. >> */ >> diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h >> index cd7670d..b6fd35a 100644 >> --- a/fs/xfs/libxfs/xfs_attr_remote.h >> +++ b/fs/xfs/libxfs/xfs_attr_remote.h >> @@ -11,6 +11,7 @@ int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen); >> int xfs_attr_rmtval_get(struct xfs_da_args *args); >> int xfs_attr_rmtval_set(struct xfs_da_args *args); >> int xfs_attr_rmtval_remove(struct xfs_da_args *args); >> +int xfs_attr_rmtval_invalidate(struct xfs_da_args *args); >> int xfs_attr_rmtval_set_value(struct xfs_da_args *args); >> int xfs_attr_rmt_find_hole(struct xfs_da_args *args); >> #endif /* __XFS_ATTR_REMOTE_H__ */ >> -- >> 2.7.4 >>
diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c index 080a284..1b13795 100644 --- a/fs/xfs/libxfs/xfs_attr_remote.c +++ b/fs/xfs/libxfs/xfs_attr_remote.c @@ -589,21 +589,14 @@ xfs_attr_rmtval_set_value( return 0; } -/* - * Remove the value associated with an attribute by deleting the - * out-of-line buffer that it is stored on. - */ int -xfs_attr_rmtval_remove( +xfs_attr_rmtval_invalidate( struct xfs_da_args *args) { struct xfs_mount *mp = args->dp->i_mount; xfs_dablk_t lblkno; int blkcnt; int error; - int done; - - trace_xfs_attr_rmtval_remove(args); /* * Roll through the "value", invalidating the attribute value's blocks. @@ -645,7 +638,27 @@ xfs_attr_rmtval_remove( lblkno += map.br_blockcount; blkcnt -= map.br_blockcount; } + return 0; +} +/* + * Remove the value associated with an attribute by deleting the + * out-of-line buffer that it is stored on. + */ +int +xfs_attr_rmtval_remove( + struct xfs_da_args *args) +{ + xfs_dablk_t lblkno; + int blkcnt; + int error = 0; + int done = 0; + + trace_xfs_attr_rmtval_remove(args); + + error = xfs_attr_rmtval_invalidate(args); + if (error) + return error; /* * Keep de-allocating extents until the remote-value region is gone. */ diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h index cd7670d..b6fd35a 100644 --- a/fs/xfs/libxfs/xfs_attr_remote.h +++ b/fs/xfs/libxfs/xfs_attr_remote.h @@ -11,6 +11,7 @@ int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen); int xfs_attr_rmtval_get(struct xfs_da_args *args); int xfs_attr_rmtval_set(struct xfs_da_args *args); int xfs_attr_rmtval_remove(struct xfs_da_args *args); +int xfs_attr_rmtval_invalidate(struct xfs_da_args *args); int xfs_attr_rmtval_set_value(struct xfs_da_args *args); int xfs_attr_rmt_find_hole(struct xfs_da_args *args); #endif /* __XFS_ATTR_REMOTE_H__ */
Because new delayed attribute routines cannot roll transactions, we carve off the parts of xfs_attr_rmtval_remove that we can use. This will help to reduce repetitive code later when we introduce delayed attributes. Signed-off-by: Allison Collins <allison.henderson@oracle.com> --- fs/xfs/libxfs/xfs_attr_remote.c | 29 +++++++++++++++++++++-------- fs/xfs/libxfs/xfs_attr_remote.h | 1 + 2 files changed, 22 insertions(+), 8 deletions(-)