diff options
| -rw-r--r-- | fs/xfs/xfs_iomap.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index d72c83d22ee0..5c6d873e292c 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c | |||
| @@ -551,8 +551,10 @@ xfs_iomap_write_direct( | |||
| 551 | "extent-state : %x \n", | 551 | "extent-state : %x \n", |
| 552 | (ip->i_mount)->m_fsname, | 552 | (ip->i_mount)->m_fsname, |
| 553 | (long long)ip->i_ino, | 553 | (long long)ip->i_ino, |
| 554 | ret_imap->br_startblock, ret_imap->br_startoff, | 554 | (unsigned long long)ret_imap->br_startblock, |
| 555 | ret_imap->br_blockcount,ret_imap->br_state); | 555 | (unsigned long long)ret_imap->br_startoff, |
| 556 | (unsigned long long)ret_imap->br_blockcount, | ||
| 557 | ret_imap->br_state); | ||
| 556 | } | 558 | } |
| 557 | return 0; | 559 | return 0; |
| 558 | 560 | ||
| @@ -722,8 +724,10 @@ retry: | |||
| 722 | "extent-state : %x \n", | 724 | "extent-state : %x \n", |
| 723 | (ip->i_mount)->m_fsname, | 725 | (ip->i_mount)->m_fsname, |
| 724 | (long long)ip->i_ino, | 726 | (long long)ip->i_ino, |
| 725 | ret_imap->br_startblock, ret_imap->br_startoff, | 727 | (unsigned long long)ret_imap->br_startblock, |
| 726 | ret_imap->br_blockcount,ret_imap->br_state); | 728 | (unsigned long long)ret_imap->br_startoff, |
| 729 | (unsigned long long)ret_imap->br_blockcount, | ||
| 730 | ret_imap->br_state); | ||
| 727 | } | 731 | } |
| 728 | 732 | ||
| 729 | *ret_imap = imap[0]; | 733 | *ret_imap = imap[0]; |
| @@ -854,17 +858,21 @@ xfs_iomap_write_allocate( | |||
| 854 | */ | 858 | */ |
| 855 | 859 | ||
| 856 | for (i = 0; i < nimaps; i++) { | 860 | for (i = 0; i < nimaps; i++) { |
| 857 | if ( !(io->io_flags & XFS_IOCORE_RT) && | 861 | if (!(io->io_flags & XFS_IOCORE_RT) && |
| 858 | !imap[i].br_startblock) { | 862 | !imap[i].br_startblock) { |
| 859 | cmn_err(CE_PANIC,"Access to block zero: " | 863 | cmn_err(CE_PANIC,"Access to block zero: " |
| 860 | "fs <%s> inode: %lld " | 864 | "fs <%s> inode: %lld " |
| 861 | "start_block : %llx start_off : %llx " | 865 | "start_block : %llx start_off : %llx " |
| 862 | "blkcnt : %llx extent-state : %x \n", | 866 | "blkcnt : %llx extent-state : %x \n", |
| 863 | (ip->i_mount)->m_fsname, | 867 | (ip->i_mount)->m_fsname, |
| 864 | (long long)ip->i_ino, | 868 | (long long)ip->i_ino, |
| 865 | imap[i].br_startblock, | 869 | (unsigned long long) |
| 866 | imap[i].br_startoff, | 870 | imap[i].br_startblock, |
| 867 | imap[i].br_blockcount,imap[i].br_state); | 871 | (unsigned long long) |
| 872 | imap[i].br_startoff, | ||
| 873 | (unsigned long long) | ||
| 874 | imap[i].br_blockcount, | ||
| 875 | imap[i].br_state); | ||
| 868 | } | 876 | } |
| 869 | if ((offset_fsb >= imap[i].br_startoff) && | 877 | if ((offset_fsb >= imap[i].br_startoff) && |
| 870 | (offset_fsb < (imap[i].br_startoff + | 878 | (offset_fsb < (imap[i].br_startoff + |
| @@ -970,8 +978,10 @@ xfs_iomap_write_unwritten( | |||
| 970 | "%llx blkcnt : %llx extent-state : %x \n", | 978 | "%llx blkcnt : %llx extent-state : %x \n", |
| 971 | (ip->i_mount)->m_fsname, | 979 | (ip->i_mount)->m_fsname, |
| 972 | (long long)ip->i_ino, | 980 | (long long)ip->i_ino, |
| 973 | imap.br_startblock,imap.br_startoff, | 981 | (unsigned long long)imap.br_startblock, |
| 974 | imap.br_blockcount,imap.br_state); | 982 | (unsigned long long)imap.br_startoff, |
| 983 | (unsigned long long)imap.br_blockcount, | ||
| 984 | imap.br_state); | ||
| 975 | } | 985 | } |
| 976 | 986 | ||
| 977 | if ((numblks_fsb = imap.br_blockcount) == 0) { | 987 | if ((numblks_fsb = imap.br_blockcount) == 0) { |