From: Dave Chinner <david@fromorbit.com>
To: Phil White <pwhite@sgi.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 23/25] xfs: connect up write verifiers to new buffers
Date: Wed, 31 Oct 2012 09:34:37 +1100 [thread overview]
Message-ID: <20121030223437.GF29378@dastard> (raw)
In-Reply-To: <20121030133938.GI18595@caliban.engr.sgi.com>
On Tue, Oct 30, 2012 at 06:39:38AM -0700, Phil White wrote:
> On Thu, Oct 25, 2012 at 05:34:12PM +1100, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@redhat.com>
> >
> > Metadata buffers that are read from disk have write verifiers
> > already attached to them, but newly allocated buffers do not. Add
> > appropriate write verifiers to all new metadata buffers.
> >
> > Signed-off-by: Dave Chinner <dchinner@redhat.com>
> > ---
> > fs/xfs/xfs_alloc.c | 6 +--
> > fs/xfs/xfs_alloc.h | 2 +
> > fs/xfs/xfs_alloc_btree.c | 1 +
> > fs/xfs/xfs_attr_leaf.c | 4 +-
> > fs/xfs/xfs_bmap.c | 2 +
> > fs/xfs/xfs_bmap_btree.c | 3 +-
> > fs/xfs/xfs_bmap_btree.h | 1 +
> > fs/xfs/xfs_btree.c | 1 +
> > fs/xfs/xfs_btree.h | 2 +
> > fs/xfs/xfs_da_btree.c | 3 ++
> > fs/xfs/xfs_dir2_block.c | 2 +
> > fs/xfs/xfs_dir2_data.c | 11 +++--
> > fs/xfs/xfs_dir2_leaf.c | 19 ++++++---
> > fs/xfs/xfs_dir2_node.c | 24 +++++++----
> > fs/xfs/xfs_dir2_priv.h | 2 +
> > fs/xfs/xfs_dquot.c | 104 ++++++++++++++++++++++-----------------------
> > fs/xfs/xfs_fsops.c | 7 ++-
> > fs/xfs/xfs_ialloc.c | 5 ++-
> > fs/xfs/xfs_ialloc.h | 4 +-
> > fs/xfs/xfs_ialloc_btree.c | 1 +
> > fs/xfs/xfs_inode.c | 14 +++++-
> > fs/xfs/xfs_inode.h | 1 +
> > fs/xfs/xfs_mount.c | 2 +-
> > fs/xfs/xfs_mount.h | 1 +
> > 24 files changed, 135 insertions(+), 87 deletions(-)
> >
>
> A few comments:
>
> > diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
> > index bb96c55..5d56886 100644
> > --- a/fs/xfs/xfs_attr_leaf.c
> > +++ b/fs/xfs/xfs_attr_leaf.c
> > @@ -923,7 +923,7 @@ xfs_attr_leaf_to_node(xfs_da_args_t *args)
> > XFS_ATTR_FORK);
> > if (error)
> > goto out;
> > - ASSERT(bp2 != NULL);
> > + bp2->b_pre_io = bp1->b_pre_io;
> > memcpy(bp2->b_addr, bp1->b_addr, XFS_LBSIZE(dp->i_mount));
> > bp1 = NULL;
> > xfs_trans_log_buf(args->trans, bp2, 0, XFS_LBSIZE(dp->i_mount) - 1);
> > @@ -977,7 +977,7 @@ xfs_attr_leaf_create(
> > XFS_ATTR_FORK);
> > if (error)
> > return(error);
> > - ASSERT(bp != NULL);
> > + bp->b_pre_io = xfs_attr_leaf_write_verify;
> > leaf = bp->b_addr;
> > memset((char *)leaf, 0, XFS_LBSIZE(dp->i_mount));
> > hdr = &leaf->hdr;
>
> I'm unclear as to why you're removing the asserts here. There must be
> a reason that you think bp is guaranteed to be safe, but I haven't
> grasped it here.
If bp is NULL then the code is going to oops immediately, anyway.
Hence the assert is redundant. Further, the function that returns
bp either gives us a valid buffer or returns an error, so logically
the assert is also redundant from that perspective.
Hence I killed them to clean up the code a little.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2012-10-30 22:32 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 6:33 [PATCH 00/25, V3] xfs: metadata buffer verifiers Dave Chinner
2012-10-25 6:33 ` [PATCH 01/25] xfs: growfs: don't read garbage for new secondary superblocks Dave Chinner
2012-10-30 0:17 ` Phil White
2012-10-25 6:33 ` [PATCH 02/25] xfs: invalidate allocbt blocks moved to the free list Dave Chinner
2012-10-26 8:47 ` Christoph Hellwig
2012-10-30 0:22 ` Phil White
2012-10-25 6:33 ` [PATCH 03/25] xfs: make buffer read verication an IO completion function Dave Chinner
2012-10-30 0:29 ` Phil White
2012-10-30 0:45 ` Dave Chinner
2012-10-30 0:55 ` Phil White
2012-10-25 6:33 ` [PATCH 04/25] xfs: uncached buffer reads need to return an error Dave Chinner
2012-10-26 8:48 ` Christoph Hellwig
2012-10-30 0:36 ` Phil White
2012-10-25 6:33 ` [PATCH 05/25] xfs: verify superblocks as they are read from disk Dave Chinner
2012-10-30 0:48 ` Phil White
2012-10-25 6:33 ` [PATCH 06/25] xfs: verify AGF blocks " Dave Chinner
2012-10-30 0:51 ` Phil White
2012-10-25 6:33 ` [PATCH 07/25] xfs: verify AGI " Dave Chinner
2012-10-30 0:53 ` Phil White
2012-10-30 22:13 ` Dave Chinner
2012-10-25 6:33 ` [PATCH 08/25] xfs: verify AGFL " Dave Chinner
2012-10-30 1:00 ` Phil White
2012-10-25 6:33 ` [PATCH 09/25] xfs: verify inode buffers " Dave Chinner
2012-10-30 1:06 ` Phil White
2012-10-25 6:33 ` [PATCH 10/25] xfs: verify btree blocks " Dave Chinner
2012-10-30 1:14 ` Phil White
2012-10-25 6:34 ` [PATCH 11/25] xfs: verify dquot " Dave Chinner
2012-10-30 1:36 ` Phil White
2012-10-25 6:34 ` [PATCH 12/25] xfs: add verifier callback to directory read code Dave Chinner
2012-10-30 3:15 ` Phil White
2012-10-25 6:34 ` [PATCH 13/25] xfs: factor dir2 block read operations Dave Chinner
2012-10-30 3:23 ` Phil White
2012-10-30 22:16 ` Dave Chinner
2012-10-25 6:34 ` [PATCH 14/25] xfs: verify dir2 block format buffers Dave Chinner
2012-10-30 3:26 ` Phil White
2012-10-25 6:34 ` [PATCH 15/25] xfs: factor dir2 free block reading Dave Chinner
2012-10-30 13:14 ` Phil White
2012-10-25 6:34 ` [PATCH 16/25] xfs: factor out dir2 data " Dave Chinner
2012-10-30 13:21 ` Phil White
2012-10-25 6:34 ` [PATCH 17/25] xfs: factor dir2 leaf read Dave Chinner
2012-10-30 13:22 ` Phil White
2012-10-25 6:34 ` [PATCH 18/25] xfs: factor and verify attr leaf reads Dave Chinner
2012-10-30 13:26 ` Phil White
2012-10-25 6:34 ` [PATCH 19/25] xfs: add xfs_da_node verification Dave Chinner
2012-10-30 13:30 ` Phil White
2012-10-30 22:23 ` Dave Chinner
2012-10-31 0:23 ` Phil White
2012-10-31 0:50 ` Dave Chinner
2012-10-25 6:34 ` [PATCH 20/25] xfs: Add verifiers to dir2 data readahead Dave Chinner
2012-10-30 13:31 ` Phil White
2012-10-25 6:34 ` [PATCH 21/25] xfs: add buffer pre-write callback Dave Chinner
2012-10-26 8:50 ` Christoph Hellwig
2012-10-30 22:30 ` Dave Chinner
2012-10-31 10:20 ` Christoph Hellwig
2012-10-30 13:32 ` Phil White
2012-10-25 6:34 ` [PATCH 22/25] xfs: add pre-write metadata buffer verifier callbacks Dave Chinner
2012-10-30 13:34 ` Phil White
2012-10-25 6:34 ` [PATCH 23/25] xfs: connect up write verifiers to new buffers Dave Chinner
2012-10-30 13:39 ` Phil White
2012-10-30 22:34 ` Dave Chinner [this message]
2012-10-25 6:34 ` [PATCH 24/25] xfs: convert buffer verifiers to an ops structure Dave Chinner
2012-10-30 13:41 ` Phil White
2012-10-25 6:34 ` [PATCH 25/25] xfs: add write verifiers to log recovery Dave Chinner
2012-10-26 8:54 ` Christoph Hellwig
2012-10-26 20:31 ` Dave Chinner
2012-10-30 12:23 ` Christoph Hellwig
2012-10-30 22:08 ` Dave Chinner
2012-10-31 10:19 ` Christoph Hellwig
2012-10-30 13:44 ` Phil White
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121030223437.GF29378@dastard \
--to=david@fromorbit.com \
--cc=pwhite@sgi.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox