diff options
author | David Chinner <dgc@sgi.com> | 2008-04-09 22:22:17 -0400 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-04-17 22:00:24 -0400 |
commit | d64e31a2f53cdcb2f95b782196faacb0995ca0c0 (patch) | |
tree | d13230aeeb739f263305c686168823e161bdf619 /fs/xfs/xfs_log_recover.c | |
parent | 556b8b166c9514b5f940047a41dad8fe8cd9a778 (diff) |
[XFS] Ensure errors from xfs_bdstrat() are correctly checked.
xfsbdstrat() is declared to return an error. That is never checked because
the error is propagated by the xfs_buf_t that is passed through the
function.
Mark xfsbdstrat() as returning void and comment the prototype on the
methods needed for error checking.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30823a
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
-rw-r--r-- | fs/xfs/xfs_log_recover.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 3a8fe7bfa2af..1f83298f90aa 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
@@ -121,7 +121,8 @@ xlog_bread( | |||
121 | XFS_BUF_SET_TARGET(bp, log->l_mp->m_logdev_targp); | 121 | XFS_BUF_SET_TARGET(bp, log->l_mp->m_logdev_targp); |
122 | 122 | ||
123 | xfsbdstrat(log->l_mp, bp); | 123 | xfsbdstrat(log->l_mp, bp); |
124 | if ((error = xfs_iowait(bp))) | 124 | error = xfs_iowait(bp); |
125 | if (error) | ||
125 | xfs_ioerror_alert("xlog_bread", log->l_mp, | 126 | xfs_ioerror_alert("xlog_bread", log->l_mp, |
126 | bp, XFS_BUF_ADDR(bp)); | 127 | bp, XFS_BUF_ADDR(bp)); |
127 | return error; | 128 | return error; |
@@ -3849,7 +3850,8 @@ xlog_do_recover( | |||
3849 | XFS_BUF_READ(bp); | 3850 | XFS_BUF_READ(bp); |
3850 | XFS_BUF_UNASYNC(bp); | 3851 | XFS_BUF_UNASYNC(bp); |
3851 | xfsbdstrat(log->l_mp, bp); | 3852 | xfsbdstrat(log->l_mp, bp); |
3852 | if ((error = xfs_iowait(bp))) { | 3853 | error = xfs_iowait(bp); |
3854 | if (error) { | ||
3853 | xfs_ioerror_alert("xlog_do_recover", | 3855 | xfs_ioerror_alert("xlog_do_recover", |
3854 | log->l_mp, bp, XFS_BUF_ADDR(bp)); | 3856 | log->l_mp, bp, XFS_BUF_ADDR(bp)); |
3855 | ASSERT(0); | 3857 | ASSERT(0); |