git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
fs
/
xfs
/
xfs_iomap.c
diff --git
a/fs/xfs/xfs_iomap.c
b/fs/xfs/xfs_iomap.c
index
8a0f044
..
091d82b
100644
(file)
--- a/
fs/xfs/xfs_iomap.c
+++ b/
fs/xfs/xfs_iomap.c
@@
-101,11
+101,11
@@
xfs_iomap_eof_align_last_fsb(
}
STATIC int
}
STATIC int
-xfs_
cmn_err
_fsblock_zero(
+xfs_
alert
_fsblock_zero(
xfs_inode_t *ip,
xfs_bmbt_irec_t *imap)
{
xfs_inode_t *ip,
xfs_bmbt_irec_t *imap)
{
- xfs_
cmn_err(XFS_PTAG_FSBLOCK_ZERO, CE_ALERT, ip->i_mount
,
+ xfs_
alert_tag(ip->i_mount, XFS_PTAG_FSBLOCK_ZERO
,
"Access to block zero in inode %llu "
"start_block: %llx start_off: %llx "
"blkcnt: %llx extent-state: %x\n",
"Access to block zero in inode %llu "
"start_block: %llx start_off: %llx "
"blkcnt: %llx extent-state: %x\n",
@@
-246,7
+246,7
@@
xfs_iomap_write_direct(
}
if (!(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);
+ error = xfs_
alert
_fsblock_zero(ip, imap);
goto error_out;
}
goto error_out;
}
@@
-464,7
+464,7
@@
retry:
}
if (!(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]);
+ return xfs_
alert
_fsblock_zero(ip, &imap[0]);
*ret_imap = imap[0];
return 0;
*ret_imap = imap[0];
return 0;
@@
-614,7
+614,7
@@
xfs_iomap_write_allocate(
* covers at least part of the callers request
*/
if (!(imap->br_startblock || XFS_IS_REALTIME_INODE(ip)))
* covers at least part of the callers request
*/
if (!(imap->br_startblock || XFS_IS_REALTIME_INODE(ip)))
- return xfs_
cmn_err
_fsblock_zero(ip, imap);
+ return xfs_
alert
_fsblock_zero(ip, imap);
if ((offset_fsb >= imap->br_startoff) &&
(offset_fsb < (imap->br_startoff +
if ((offset_fsb >= imap->br_startoff) &&
(offset_fsb < (imap->br_startoff +
@@
-724,7
+724,7
@@
xfs_iomap_write_unwritten(
return XFS_ERROR(error);
if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip)))
return XFS_ERROR(error);
if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip)))
- return xfs_
cmn_err
_fsblock_zero(ip, &imap);
+ return xfs_
alert
_fsblock_zero(ip, &imap);
if ((numblks_fsb = imap.br_blockcount) == 0) {
/*
if ((numblks_fsb = imap.br_blockcount) == 0) {
/*