niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

xfs: refactor scrub context initialization

Browse source 
It's a little silly how the memset in scrub context initialization
forces us to declare stack variables to preserve context variables
across a retry.  Since the teardown functions already null out most of
the ephemeral state (buffer pointers, btree cursors, etc.), just skip
the memset and move the initialization as needed.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
Darrick J. Wong 2019-04-16 08:21:59 -07:00
parent 89d139d5ad
commit 9d71e15586
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs/xfs/scrub/scrub.c
View file

@ -186,8 +186,10 @@ xchk_teardown(
xfs_irele(sc->ip); xfs_irele(sc->ip);
sc->ip = NULL; sc->ip = NULL;
} }
if (sc->has_quotaofflock) if (sc->has_quotaofflock) {
mutex_unlock(&sc->mp->m_quotainfo->qi_quotaofflock); mutex_unlock(&sc->mp->m_quotainfo->qi_quotaofflock);
sc->has_quotaofflock = false;
}
if (sc->buf) { if (sc->buf) {
kmem_free(sc->buf); kmem_free(sc->buf);
sc->buf = NULL; sc->buf = NULL;
@ -466,9 +468,14 @@ xfs_scrub_metadata(
struct xfs_inode *ip, struct xfs_inode *ip,
struct xfs_scrub_metadata *sm) struct xfs_scrub_metadata *sm)
{ {
struct xfs_scrub sc; struct xfs_scrub sc = {
.mp = ip->i_mount,
.sm = sm,
.sa = {
.agno = NULLAGNUMBER,
},
};
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
bool try_harder = false;
bool already_fixed = false; bool already_fixed = false;
int error = 0; int error = 0;
@ -491,21 +498,16 @@ xfs_scrub_metadata(
xchk_experimental_warning(mp); xchk_experimental_warning(mp);
sc.ops = &meta_scrub_ops[sm->sm_type];
retry_op: retry_op:
/* Set up for the operation. */ /* Set up for the operation. */
memset(&sc, 0, sizeof(sc));
sc.mp = ip->i_mount;
sc.sm = sm;
sc.ops = &meta_scrub_ops[sm->sm_type];
sc.try_harder = try_harder;
sc.sa.agno = NULLAGNUMBER;
error = sc.ops->setup(&sc, ip); error = sc.ops->setup(&sc, ip);
if (error) if (error)
goto out_teardown; goto out_teardown;
/* Scrub for errors. */ /* Scrub for errors. */
error = sc.ops->scrub(&sc); error = sc.ops->scrub(&sc);
if (!try_harder && error == -EDEADLOCK) { if (!sc.try_harder && error == -EDEADLOCK) {
/* /*
* Scrubbers return -EDEADLOCK to mean 'try harder'. * Scrubbers return -EDEADLOCK to mean 'try harder'.
* Tear down everything we hold, then set up again with * Tear down everything we hold, then set up again with
@ -514,7 +516,7 @@ retry_op:
error = xchk_teardown(&sc, ip, 0); error = xchk_teardown(&sc, ip, 0);
if (error) if (error)
goto out; goto out;
try_harder = true; sc.try_harder = true;
goto retry_op; goto retry_op;
} else if (error) } else if (error)
goto out_teardown; goto out_teardown;
@ -544,8 +546,11 @@ retry_op:
*/ */
error = xrep_attempt(ip, &sc, &already_fixed); error = xrep_attempt(ip, &sc, &already_fixed);
if (error == -EAGAIN) { if (error == -EAGAIN) {
if (sc.try_harder) /*
try_harder = true; * Either the repair function succeeded or it couldn't
* get all the resources it needs; either way, we go
* back to the beginning and call the scrub function.
*/
error = xchk_teardown(&sc, ip, 0); error = xchk_teardown(&sc, ip, 0);
if (error) { if (error) {
xrep_failure(mp); xrep_failure(mp);