From: Dave Chinner <david@fromorbit.com>
To: Mark Tinguely <tinguely@sgi.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH v2 3/3] xfs: fix the multi-segment log buffer format
Date: Mon, 3 Dec 2012 10:52:11 +1100 [thread overview]
Message-ID: <20121202235211.GE29399@dastard> (raw)
In-Reply-To: <20121128222622.908368793@sgi.com>
On Wed, Nov 28, 2012 at 04:23:12PM -0600, Mark Tinguely wrote:
> Per Dave Chinner suggestion, this patch:
> 1) Corrects the detection of whether a multi-segment buffer is
> still tracking data.
> 2) Clears all the buffer log formats for a multi-segment buffer.
>
> Signed-off-by: Mark Tinguely <tinguely@sgi.com>
>
> ---
> fs/xfs/xfs_buf_item.c | 13 ++++++++++---
> fs/xfs/xfs_trans_buf.c | 7 +++++--
> 2 files changed, 15 insertions(+), 5 deletions(-)
>
> Index: b/fs/xfs/xfs_buf_item.c
> ===================================================================
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -508,7 +508,7 @@ xfs_buf_item_unlock(
> {
> struct xfs_buf_log_item *bip = BUF_ITEM(lip);
> struct xfs_buf *bp = bip->bli_buf;
> - int aborted;
> + int aborted, empty, i;
> uint hold;
>
> /* Clear the buffer's association with this transaction. */
> @@ -551,8 +551,15 @@ xfs_buf_item_unlock(
> * If the buf item isn't tracking any data, free it, otherwise drop the
> * reference we hold to it.
> */
> - if (xfs_bitmap_empty(bip->__bli_format.blf_data_map,
> - bip->__bli_format.blf_map_size))
> + empty = 1;
> + for (i = 0; i < bip->bli_format_count; i++) {
> + if (!xfs_bitmap_empty(bip->bli_formats[i].blf_data_map,
> + bip->bli_formats[i].blf_map_size)) {
> + empty = 0;
> + break;
> + }
> + }
> + if (empty)
> xfs_buf_item_relse(bp);
> else
> atomic_dec(&bip->bli_refcount);
I think "clean" is a better name for the temporary variable, as what
we are actually checking is whether the buffer has been modified or
not (i.e. whether it is clean or dirty)....
> Index: b/fs/xfs/xfs_trans_buf.c
> ===================================================================
> --- a/fs/xfs/xfs_trans_buf.c
> +++ b/fs/xfs/xfs_trans_buf.c
> @@ -643,6 +643,7 @@ xfs_trans_binval(
> xfs_buf_t *bp)
> {
> xfs_buf_log_item_t *bip = bp->b_fspriv;
> + int i;
>
> ASSERT(bp->b_transp == tp);
> ASSERT(bip != NULL);
> @@ -670,8 +671,10 @@ xfs_trans_binval(
> bip->bli_flags &= ~(XFS_BLI_INODE_BUF | XFS_BLI_LOGGED | XFS_BLI_DIRTY);
> bip->__bli_format.blf_flags &= ~XFS_BLF_INODE_BUF;
> bip->__bli_format.blf_flags |= XFS_BLF_CANCEL;
> - memset((char *)(bip->__bli_format.blf_data_map), 0,
> - (bip->__bli_format.blf_map_size * sizeof(uint)));
> + for (i = 0; i < bip->bli_format_count; i++) {
> + memset((char *)(bip->bli_formats[i].blf_data_map), 0,
> + (bip->bli_formats[i].blf_map_size * sizeof(uint)));
No cast needed - memset() takes a void pointer....
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2012-12-02 23:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-28 22:23 [PATCH v2 0/3] discontiguous buffer patches Mark Tinguely
2012-11-28 22:23 ` [PATCH v2 1/3] xfs: use b_maps[] for discontiguous buffers Mark Tinguely
2012-11-30 16:09 ` Christoph Hellwig
2012-11-30 17:55 ` Mark Tinguely
2012-11-30 22:21 ` Dave Chinner
2012-11-30 23:09 ` Christoph Hellwig
2012-11-30 22:18 ` Dave Chinner
2012-12-02 23:31 ` Dave Chinner
2012-11-28 22:23 ` [PATCH v2 2/3] xfs: fix the buffer log format for contiguous buffers Mark Tinguely
2012-12-02 23:46 ` Dave Chinner
2012-11-28 22:23 ` [PATCH v2 3/3] xfs: fix the multi-segment log buffer format Mark Tinguely
2012-11-30 23:14 ` Christoph Hellwig
2012-12-02 23:52 ` Dave Chinner [this message]
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=20121202235211.GE29399@dastard \
--to=david@fromorbit.com \
--cc=tinguely@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