From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 2/4] xfs: factor our a helper to calculate the EOF alignment
Date: Thu, 25 Aug 2016 08:38:04 -0400 [thread overview]
Message-ID: <20160825123804.GB25041@bfoster.bfoster> (raw)
In-Reply-To: <1471816273-28940-3-git-send-email-hch@lst.de>
On Sun, Aug 21, 2016 at 11:51:11PM +0200, Christoph Hellwig wrote:
> And drop the pointless mp argument to xfs_iomap_eof_align_last_fsb,
> while we're at it.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_iomap.c | 31 +++++++++++++++++++++----------
> 1 file changed, 21 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index ba3592f..918511a 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -70,15 +70,13 @@ xfs_bmbt_to_iomap(
> iomap->bdev = xfs_find_bdev_for_inode(VFS_I(ip));
> }
>
> -STATIC int
> -xfs_iomap_eof_align_last_fsb(
> - xfs_mount_t *mp,
> - xfs_inode_t *ip,
> - xfs_extlen_t extsize,
> - xfs_fileoff_t *last_fsb)
> +static xfs_extlen_t
> +xfs_eof_alignment(
> + struct xfs_inode *ip,
> + xfs_extlen_t extsize)
> {
> - xfs_extlen_t align = 0;
> - int eof, error;
> + struct xfs_mount *mp = ip->i_mount;
> + xfs_extlen_t align = 0;
>
> if (!XFS_IS_REALTIME_INODE(ip)) {
> /*
> @@ -109,8 +107,21 @@ xfs_iomap_eof_align_last_fsb(
> align = extsize;
> }
>
> + return align;
> +}
> +
> +STATIC int
> +xfs_iomap_eof_align_last_fsb(
> + struct xfs_inode *ip,
> + xfs_extlen_t extsize,
> + xfs_fileoff_t *last_fsb)
> +{
> + xfs_extlen_t align = xfs_eof_alignment(ip, extsize);
> +
> if (align) {
> xfs_fileoff_t new_last_fsb = roundup_64(*last_fsb, align);
> + int eof, error;
> +
> error = xfs_bmap_eof(ip, new_last_fsb, XFS_DATA_FORK, &eof);
> if (error)
> return error;
> @@ -180,7 +191,7 @@ xfs_iomap_write_direct(
> */
> ASSERT(XFS_IFORK_PTR(ip, XFS_DATA_FORK)->if_flags &
> XFS_IFEXTENTS);
> - error = xfs_iomap_eof_align_last_fsb(mp, ip, extsz, &last_fsb);
> + error = xfs_iomap_eof_align_last_fsb(ip, extsz, &last_fsb);
> if (error)
> goto out_unlock;
> } else {
> @@ -638,7 +649,7 @@ retry:
> }
>
> if (prealloc || extsz) {
> - error = xfs_iomap_eof_align_last_fsb(mp, ip, extsz, &last_fsb);
> + error = xfs_iomap_eof_align_last_fsb(ip, extsz, &last_fsb);
> if (error)
> return error;
> }
> --
> 2.1.4
>
> _______________________________________________
> 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:[~2016-08-25 12:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-21 21:51 iomap write fixes Christoph Hellwig
2016-08-21 21:51 ` [PATCH 1/4] xfs: move xfs_bmbt_to_iomap up Christoph Hellwig
2016-08-25 12:38 ` Brian Foster
2016-08-21 21:51 ` [PATCH 2/4] xfs: factor our a helper to calculate the EOF alignment Christoph Hellwig
2016-08-25 12:38 ` Brian Foster [this message]
2016-08-21 21:51 ` [PATCH 3/4] xfs: make xfs_inode_set_eofblocks_tag cheaper for the common case Christoph Hellwig
2016-08-25 12:38 ` Brian Foster
2016-08-26 14:26 ` Christoph Hellwig
2016-08-26 16:02 ` Brian Foster
2016-08-30 14:40 ` Christoph Hellwig
2016-08-30 23:03 ` Dave Chinner
2016-08-21 21:51 ` [PATCH 4/4] xfs: rewrite and optimize the delalloc write path Christoph Hellwig
2016-08-25 14:37 ` Brian Foster
2016-08-26 14:33 ` Christoph Hellwig
2016-08-26 16:03 ` Brian Foster
2016-08-26 16:07 ` Brian Foster
2016-08-30 14:44 ` Christoph Hellwig
2016-08-30 20:28 ` Brian Foster
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=20160825123804.GB25041@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=hch@lst.de \
--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;
as well as URLs for NNTP newsgroup(s).