diff options
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index d820ada49b18..da871f532236 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
| @@ -142,10 +142,9 @@ xfs_imap_to_bp( | |||
| 142 | (int)imap->im_len, buf_flags, &bp); | 142 | (int)imap->im_len, buf_flags, &bp); |
| 143 | if (error) { | 143 | if (error) { |
| 144 | if (error != EAGAIN) { | 144 | if (error != EAGAIN) { |
| 145 | cmn_err(CE_WARN, | 145 | xfs_warn(mp, |
| 146 | "xfs_imap_to_bp: xfs_trans_read_buf()returned " | 146 | "%s: xfs_trans_read_buf() returned error %d.", |
| 147 | "an error %d on %s. Returning error.", | 147 | __func__, error); |
| 148 | error, mp->m_fsname); | ||
| 149 | } else { | 148 | } else { |
| 150 | ASSERT(buf_flags & XBF_TRYLOCK); | 149 | ASSERT(buf_flags & XBF_TRYLOCK); |
| 151 | } | 150 | } |
| @@ -180,12 +179,11 @@ xfs_imap_to_bp( | |||
| 180 | XFS_CORRUPTION_ERROR("xfs_imap_to_bp", | 179 | XFS_CORRUPTION_ERROR("xfs_imap_to_bp", |
| 181 | XFS_ERRLEVEL_HIGH, mp, dip); | 180 | XFS_ERRLEVEL_HIGH, mp, dip); |
| 182 | #ifdef DEBUG | 181 | #ifdef DEBUG |
| 183 | cmn_err(CE_PANIC, | 182 | xfs_emerg(mp, |
| 184 | "Device %s - bad inode magic/vsn " | 183 | "bad inode magic/vsn daddr %lld #%d (magic=%x)", |
| 185 | "daddr %lld #%d (magic=%x)", | ||
| 186 | XFS_BUFTARG_NAME(mp->m_ddev_targp), | ||
| 187 | (unsigned long long)imap->im_blkno, i, | 184 | (unsigned long long)imap->im_blkno, i, |
| 188 | be16_to_cpu(dip->di_magic)); | 185 | be16_to_cpu(dip->di_magic)); |
| 186 | ASSERT(0); | ||
| 189 | #endif | 187 | #endif |
| 190 | xfs_trans_brelse(tp, bp); | 188 | xfs_trans_brelse(tp, bp); |
| 191 | return XFS_ERROR(EFSCORRUPTED); | 189 | return XFS_ERROR(EFSCORRUPTED); |
| @@ -1811,9 +1809,8 @@ xfs_iunlink_remove( | |||
| 1811 | */ | 1809 | */ |
| 1812 | error = xfs_itobp(mp, tp, ip, &dip, &ibp, XBF_LOCK); | 1810 | error = xfs_itobp(mp, tp, ip, &dip, &ibp, XBF_LOCK); |
| 1813 | if (error) { | 1811 | if (error) { |
| 1814 | cmn_err(CE_WARN, | 1812 | xfs_warn(mp, "%s: xfs_itobp() returned error %d.", |
| 1815 | "xfs_iunlink_remove: xfs_itobp() returned an error %d on %s. Returning error.", | 1813 | __func__, error); |
| 1816 | error, mp->m_fsname); | ||
| 1817 | return error; | 1814 | return error; |
| 1818 | } | 1815 | } |
| 1819 | next_agino = be32_to_cpu(dip->di_next_unlinked); | 1816 | next_agino = be32_to_cpu(dip->di_next_unlinked); |
| @@ -1858,9 +1855,9 @@ xfs_iunlink_remove( | |||
| 1858 | error = xfs_inotobp(mp, tp, next_ino, &last_dip, | 1855 | error = xfs_inotobp(mp, tp, next_ino, &last_dip, |
| 1859 | &last_ibp, &last_offset, 0); | 1856 | &last_ibp, &last_offset, 0); |
| 1860 | if (error) { | 1857 | if (error) { |
| 1861 | cmn_err(CE_WARN, | 1858 | xfs_warn(mp, |
| 1862 | "xfs_iunlink_remove: xfs_inotobp() returned an error %d on %s. Returning error.", | 1859 | "%s: xfs_inotobp() returned error %d.", |
| 1863 | error, mp->m_fsname); | 1860 | __func__, error); |
| 1864 | return error; | 1861 | return error; |
| 1865 | } | 1862 | } |
| 1866 | next_agino = be32_to_cpu(last_dip->di_next_unlinked); | 1863 | next_agino = be32_to_cpu(last_dip->di_next_unlinked); |
| @@ -1873,9 +1870,8 @@ xfs_iunlink_remove( | |||
| 1873 | */ | 1870 | */ |
| 1874 | error = xfs_itobp(mp, tp, ip, &dip, &ibp, XBF_LOCK); | 1871 | error = xfs_itobp(mp, tp, ip, &dip, &ibp, XBF_LOCK); |
| 1875 | if (error) { | 1872 | if (error) { |
| 1876 | cmn_err(CE_WARN, | 1873 | xfs_warn(mp, "%s: xfs_itobp(2) returned error %d.", |
| 1877 | "xfs_iunlink_remove: xfs_itobp() returned an error %d on %s. Returning error.", | 1874 | __func__, error); |
| 1878 | error, mp->m_fsname); | ||
| 1879 | return error; | 1875 | return error; |
| 1880 | } | 1876 | } |
| 1881 | next_agino = be32_to_cpu(dip->di_next_unlinked); | 1877 | next_agino = be32_to_cpu(dip->di_next_unlinked); |