diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
tree | 50c101806f4d3b6585222dda060559eb4f3e005a /fs/xfs/xfs_rw.c | |
parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'fs/xfs/xfs_rw.c')
-rw-r--r-- | fs/xfs/xfs_rw.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/xfs_rw.c b/fs/xfs/xfs_rw.c index c4b20872f07d..a59c102cf214 100644 --- a/fs/xfs/xfs_rw.c +++ b/fs/xfs/xfs_rw.c | |||
@@ -238,6 +238,7 @@ xfs_bioerror_relse( | |||
238 | } | 238 | } |
239 | return (EIO); | 239 | return (EIO); |
240 | } | 240 | } |
241 | |||
241 | /* | 242 | /* |
242 | * Prints out an ALERT message about I/O error. | 243 | * Prints out an ALERT message about I/O error. |
243 | */ | 244 | */ |
@@ -252,11 +253,9 @@ xfs_ioerror_alert( | |||
252 | "I/O error in filesystem (\"%s\") meta-data dev %s block 0x%llx" | 253 | "I/O error in filesystem (\"%s\") meta-data dev %s block 0x%llx" |
253 | " (\"%s\") error %d buf count %zd", | 254 | " (\"%s\") error %d buf count %zd", |
254 | (!mp || !mp->m_fsname) ? "(fs name not set)" : mp->m_fsname, | 255 | (!mp || !mp->m_fsname) ? "(fs name not set)" : mp->m_fsname, |
255 | XFS_BUFTARG_NAME(bp->pb_target), | 256 | XFS_BUFTARG_NAME(XFS_BUF_TARGET(bp)), |
256 | (__uint64_t)blkno, | 257 | (__uint64_t)blkno, func, |
257 | func, | 258 | XFS_BUF_GETERROR(bp), XFS_BUF_COUNT(bp)); |
258 | XFS_BUF_GETERROR(bp), | ||
259 | XFS_BUF_COUNT(bp)); | ||
260 | } | 259 | } |
261 | 260 | ||
262 | /* | 261 | /* |