From: Eric Sandeen <sandeen@sandeen.net>
To: Christoph Hellwig <hch@infradead.org>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 2/7] xfs: remove xfs_buf_get / xfs_buf_read
Date: Wed, 18 Nov 2009 22:40:43 -0600 [thread overview]
Message-ID: <4B04CC4B.4080109@sandeen.net> (raw)
In-Reply-To: <20091114161801.411213050@bombadil.infradead.org>
Christoph Hellwig wrote:
> The two interfaces are highl confusing as they do have a flags argument
> which gets ignored and replaced with default flags. Switch the few remaining
> callers to use xfs_buf_get_flags and xfs_buf_read_flags instead and remove
> these wrappers.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
> Index: xfs/fs/xfs/linux-2.6/xfs_buf.h
> ===================================================================
> --- xfs.orig/fs/xfs/linux-2.6/xfs_buf.h 2009-11-12 17:13:55.334003777 +0100
> +++ xfs/fs/xfs/linux-2.6/xfs_buf.h 2009-11-12 17:17:21.873006402 +0100
> @@ -189,13 +189,8 @@ extern xfs_buf_t *_xfs_buf_find(xfs_buft
>
> extern xfs_buf_t *xfs_buf_get_flags(xfs_buftarg_t *, xfs_off_t, size_t,
> xfs_buf_flags_t);
> -#define xfs_buf_get(target, blkno, len, flags) \
> - xfs_buf_get_flags((target), (blkno), (len), XBF_LOCK | XBF_MAPPED)
> -
> extern xfs_buf_t *xfs_buf_read_flags(xfs_buftarg_t *, xfs_off_t, size_t,
> xfs_buf_flags_t);
> -#define xfs_buf_read(target, blkno, len, flags) \
> - xfs_buf_read_flags((target), (blkno), (len), XBF_LOCK | XBF_MAPPED)
>
> extern xfs_buf_t *xfs_buf_get_empty(size_t, xfs_buftarg_t *);
> extern xfs_buf_t *xfs_buf_get_noaddr(size_t, xfs_buftarg_t *);
> Index: xfs/fs/xfs/xfs_log_recover.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_log_recover.c 2009-11-12 17:10:20.286254746 +0100
> +++ xfs/fs/xfs/xfs_log_recover.c 2009-11-12 17:14:15.274004198 +0100
> @@ -2206,6 +2206,7 @@ xlog_recover_do_buffer_trans(
> xfs_daddr_t blkno;
> int len;
> ushort flags;
> + uint buf_flags;
>
> buf_f = (xfs_buf_log_format_t *)item->ri_buf[0].i_addr;
>
> @@ -2246,12 +2247,11 @@ xlog_recover_do_buffer_trans(
> }
>
> mp = log->l_mp;
> - if (flags & XFS_BLI_INODE_BUF) {
> - bp = xfs_buf_read_flags(mp->m_ddev_targp, blkno, len,
> - XFS_BUF_LOCK);
> - } else {
> - bp = xfs_buf_read(mp->m_ddev_targp, blkno, len, 0);
> - }
> + buf_flags = XFS_BUF_LOCK;
> + if (!(flags & XFS_BLI_INODE_BUF))
> + buf_flags |= XFS_BUF_MAPPED;
> +
> + bp = xfs_buf_read_flags(mp->m_ddev_targp, blkno, len, buf_flags);
> if (XFS_BUF_ISERROR(bp)) {
> xfs_ioerror_alert("xlog_recover_do..(read#1)", log->l_mp,
> bp, blkno);
> Index: xfs/fs/xfs/xfs_rw.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_rw.c 2009-11-12 17:10:20.326254256 +0100
> +++ xfs/fs/xfs/xfs_rw.c 2009-11-12 17:14:15.278004428 +0100
> @@ -277,10 +277,10 @@ xfs_read_buf(
> xfs_buf_t *bp;
> int error;
>
> - if (flags)
> - bp = xfs_buf_read_flags(target, blkno, len, flags);
> - else
> - bp = xfs_buf_read(target, blkno, len, flags);
> + if (!flags)
> + flags = XBF_LOCK | XBF_MAPPED;
> +
> + bp = xfs_buf_read_flags(target, blkno, len, flags);
> if (!bp)
> return XFS_ERROR(EIO);
> error = XFS_BUF_GETERROR(bp);
> Index: xfs/fs/xfs/xfs_fsops.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_fsops.c 2009-11-12 17:15:17.097272663 +0100
> +++ xfs/fs/xfs/xfs_fsops.c 2009-11-12 17:16:53.487005554 +0100
> @@ -200,9 +200,9 @@ xfs_growfs_data_private(
> /*
> * AG freelist header block
> */
> - bp = xfs_buf_get(mp->m_ddev_targp,
> - XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
> - XFS_FSS_TO_BB(mp, 1), 0);
> + bp = xfs_buf_get_flags(mp->m_ddev_targp,
> + XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
> + XFS_FSS_TO_BB(mp, 1), XBF_LOCK | XBF_MAPPED);
> agf = XFS_BUF_TO_AGF(bp);
> memset(agf, 0, mp->m_sb.sb_sectsize);
> agf->agf_magicnum = cpu_to_be32(XFS_AGF_MAGIC);
> @@ -232,9 +232,9 @@ xfs_growfs_data_private(
> /*
> * AG inode header block
> */
> - bp = xfs_buf_get(mp->m_ddev_targp,
> - XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
> - XFS_FSS_TO_BB(mp, 1), 0);
> + bp = xfs_buf_get_flags(mp->m_ddev_targp,
> + XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
> + XFS_FSS_TO_BB(mp, 1), XBF_LOCK | XBF_MAPPED);
> agi = XFS_BUF_TO_AGI(bp);
> memset(agi, 0, mp->m_sb.sb_sectsize);
> agi->agi_magicnum = cpu_to_be32(XFS_AGI_MAGIC);
> @@ -256,9 +256,9 @@ xfs_growfs_data_private(
> /*
> * BNO btree root block
> */
> - bp = xfs_buf_get(mp->m_ddev_targp,
> - XFS_AGB_TO_DADDR(mp, agno, XFS_BNO_BLOCK(mp)),
> - BTOBB(mp->m_sb.sb_blocksize), 0);
> + bp = xfs_buf_get_flags(mp->m_ddev_targp,
> + XFS_AGB_TO_DADDR(mp, agno, XFS_BNO_BLOCK(mp)),
> + BTOBB(mp->m_sb.sb_blocksize), XBF_LOCK | XBF_MAPPED);
> block = XFS_BUF_TO_BLOCK(bp);
> memset(block, 0, mp->m_sb.sb_blocksize);
> block->bb_magic = cpu_to_be32(XFS_ABTB_MAGIC);
> @@ -277,9 +277,9 @@ xfs_growfs_data_private(
> /*
> * CNT btree root block
> */
> - bp = xfs_buf_get(mp->m_ddev_targp,
> - XFS_AGB_TO_DADDR(mp, agno, XFS_CNT_BLOCK(mp)),
> - BTOBB(mp->m_sb.sb_blocksize), 0);
> + bp = xfs_buf_get_flags(mp->m_ddev_targp,
> + XFS_AGB_TO_DADDR(mp, agno, XFS_CNT_BLOCK(mp)),
> + BTOBB(mp->m_sb.sb_blocksize), XBF_LOCK | XBF_MAPPED);
> block = XFS_BUF_TO_BLOCK(bp);
> memset(block, 0, mp->m_sb.sb_blocksize);
> block->bb_magic = cpu_to_be32(XFS_ABTC_MAGIC);
> @@ -299,9 +299,9 @@ xfs_growfs_data_private(
> /*
> * INO btree root block
> */
> - bp = xfs_buf_get(mp->m_ddev_targp,
> - XFS_AGB_TO_DADDR(mp, agno, XFS_IBT_BLOCK(mp)),
> - BTOBB(mp->m_sb.sb_blocksize), 0);
> + bp = xfs_buf_get_flags(mp->m_ddev_targp,
> + XFS_AGB_TO_DADDR(mp, agno, XFS_IBT_BLOCK(mp)),
> + BTOBB(mp->m_sb.sb_blocksize), XBF_LOCK | XBF_MAPPED);
> block = XFS_BUF_TO_BLOCK(bp);
> memset(block, 0, mp->m_sb.sb_blocksize);
> block->bb_magic = cpu_to_be32(XFS_IBT_MAGIC);
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2009-11-19 4:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-14 16:17 [PATCH 0/7] assorted cleanups Christoph Hellwig
2009-11-14 16:17 ` [PATCH 1/7] xfs: remove IO_ISAIO Christoph Hellwig
2009-11-16 3:05 ` Dave Chinner
2009-11-19 4:36 ` Eric Sandeen
2009-11-14 16:17 ` [PATCH 2/7] xfs: remove xfs_buf_get / xfs_buf_read Christoph Hellwig
2009-11-16 3:15 ` Dave Chinner
2009-11-16 11:03 ` Christoph Hellwig
2009-11-19 4:40 ` Eric Sandeen [this message]
2009-11-24 18:02 ` [PATCH v2 2/7] xfs: simplify xfs_buf_get / xfs_buf_read interfaces Christoph Hellwig
2009-11-25 0:16 ` Dave Chinner
2009-11-14 16:17 ` [PATCH 3/7] xfs: rename xfs_attr_fetch to xfs_attr_get_int Christoph Hellwig
2009-11-16 3:17 ` Dave Chinner
2009-11-19 4:42 ` Eric Sandeen
2009-11-14 16:17 ` [PATCH 4/7] xfs: uninline xfs_get_extsz_hint Christoph Hellwig
2009-11-16 3:18 ` Dave Chinner
2009-11-19 4:51 ` Eric Sandeen
2009-11-14 16:17 ` [PATCH 5/7] xfs: kill the STATIC_INLINE macro Christoph Hellwig
2009-11-16 3:20 ` Dave Chinner
2009-11-14 16:17 ` [PATCH 6/7] xfs: remove incorrect sparse annotation for xfs_iget_cache_miss Christoph Hellwig
2009-11-16 3:22 ` Dave Chinner
2009-11-14 16:17 ` [PATCH 7/7] xfs: cleanup dmapi macros in the umount path Christoph Hellwig
2009-11-16 3:29 ` Dave Chinner
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=4B04CC4B.4080109@sandeen.net \
--to=sandeen@sandeen.net \
--cc=hch@infradead.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.