lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFS] Fix check for block zero access in xfs_write_iomap_allocate()

Browse Source 
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 in xfs_iomap.c

SGI-PV: 980888
SGI-Modid: xfs-linux-melb:xfs-kern:30998a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
David Chinner
2008-04-29 12:53:21 +10:00
committed by Lachlan McIlroy
parent d349404ff1
commit 86c4d62305
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/xfs/xfs_iomap.c
View File

@@ -523,8 +523,7 @@ xfs_iomap_write_direct(
goto error_out; goto error_out;
} }
if (unlikely(!imap.br_startblock && if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip))) {
!(XFS_IS_REALTIME_INODE(ip)))) {
error = xfs_cmn_err_fsblock_zero(ip, &imap); error = xfs_cmn_err_fsblock_zero(ip, &imap);
goto error_out; goto error_out;
} }
@@ -686,8 +685,7 @@ retry:
goto retry; goto retry;
} }
if (unlikely(!imap[0].br_startblock && if (!(imap[0].br_startblock || XFS_IS_REALTIME_INODE(ip)))
!(XFS_IS_REALTIME_INODE(ip))))
return xfs_cmn_err_fsblock_zero(ip, &imap[0]); return xfs_cmn_err_fsblock_zero(ip, &imap[0]);
*ret_imap = imap[0]; *ret_imap = imap[0];
@@ -838,9 +836,9 @@ xfs_iomap_write_allocate(
* See if we were able to allocate an extent that * See if we were able to allocate an extent that
* covers at least part of the callers request * covers at least part of the callers request
*/ */
if (unlikely(!imap.br_startblock && if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip)))
XFS_IS_REALTIME_INODE(ip)))
return xfs_cmn_err_fsblock_zero(ip, &imap); return xfs_cmn_err_fsblock_zero(ip, &imap);
if ((offset_fsb >= imap.br_startoff) && if ((offset_fsb >= imap.br_startoff) &&
(offset_fsb < (imap.br_startoff + (offset_fsb < (imap.br_startoff +
imap.br_blockcount))) { imap.br_blockcount))) {
@@ -934,8 +932,7 @@ xfs_iomap_write_unwritten(
if (error) if (error)
return XFS_ERROR(error); return XFS_ERROR(error);
if (unlikely(!imap.br_startblock && if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip)))
!(XFS_IS_REALTIME_INODE(ip))))
return xfs_cmn_err_fsblock_zero(ip, &imap); return xfs_cmn_err_fsblock_zero(ip, &imap);
if ((numblks_fsb = imap.br_blockcount) == 0) { if ((numblks_fsb = imap.br_blockcount) == 0) {