From: Lachlan McIlroy <lachlan@sgi.com>
To: David Chinner <dgc@sgi.com>
Cc: xfs-dev <xfs-dev@sgi.com>, xfs-oss <xfs@oss.sgi.com>
Subject: Re: [PATCH] Fix check for block zero access in xfs_write_iomap_allocate
Date: Wed, 23 Apr 2008 14:06:38 +1000 [thread overview]
Message-ID: <480EB5CE.90001@sgi.com> (raw)
In-Reply-To: <20080422110210.GZ103491721@sgi.com>
Looks good.
David Chinner wrote:
> Fix check for block zero access in xfs_write_iomap_allocate
>
> The check for block zero access should be done on non-realtime
> inodes. Fix the logic error in xfs_write_iomap_allocate(), and
> simplify the logic on all checks for block zero access.
>
> Signed-off-by: Dave Chinner <dgc@sgi.com>
> ---
> fs/xfs/xfs_iomap.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> Index: 2.6.x-xfs-new/fs/xfs/xfs_iomap.c
> ===================================================================
> --- 2.6.x-xfs-new.orig/fs/xfs/xfs_iomap.c 2008-04-22 11:54:54.000000000 +1000
> +++ 2.6.x-xfs-new/fs/xfs/xfs_iomap.c 2008-04-22 20:45:53.469961429 +1000
> @@ -523,8 +523,7 @@ xfs_iomap_write_direct(
> goto error_out;
> }
>
> - if (unlikely(!imap.br_startblock &&
> - !(XFS_IS_REALTIME_INODE(ip)))) {
> + if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip))) {
> error = xfs_cmn_err_fsblock_zero(ip, &imap);
> goto error_out;
> }
> @@ -686,8 +685,7 @@ retry:
> goto retry;
> }
>
> - if (unlikely(!imap[0].br_startblock &&
> - !(XFS_IS_REALTIME_INODE(ip))))
> + if (!(imap[0].br_startblock || XFS_IS_REALTIME_INODE(ip)))
> return xfs_cmn_err_fsblock_zero(ip, &imap[0]);
>
> *ret_imap = imap[0];
> @@ -838,9 +836,9 @@ xfs_iomap_write_allocate(
> * See if we were able to allocate an extent that
> * covers at least part of the callers request
> */
> - if (unlikely(!imap.br_startblock &&
> - XFS_IS_REALTIME_INODE(ip)))
> + if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip)))
> return xfs_cmn_err_fsblock_zero(ip, &imap);
> +
> if ((offset_fsb >= imap.br_startoff) &&
> (offset_fsb < (imap.br_startoff +
> imap.br_blockcount))) {
> @@ -934,8 +932,7 @@ xfs_iomap_write_unwritten(
> if (error)
> return XFS_ERROR(error);
>
> - if (unlikely(!imap.br_startblock &&
> - !(XFS_IS_REALTIME_INODE(ip))))
> + if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip)))
> return xfs_cmn_err_fsblock_zero(ip, &imap);
>
> if ((numblks_fsb = imap.br_blockcount) == 0) {
>
>
>
prev parent reply other threads:[~2008-04-23 4:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-22 11:02 [PATCH] Fix check for block zero access in xfs_write_iomap_allocate David Chinner
2008-04-23 4:06 ` Lachlan McIlroy [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=480EB5CE.90001@sgi.com \
--to=lachlan@sgi.com \
--cc=dgc@sgi.com \
--cc=xfs-dev@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