mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xfs: clean up xfs_ioerror_alert 

Instead of passing the block number and mount structure explicitly
get them off the bp and fix make the argument order more natural.

Also move it to xfs_buf.c and stop printing the device name given
that we already get the fs name as part of xfs_alert, and we know
what device is operates on because of the caller that gets printed,
finally rename it to xfs_buf_ioerror_alert and pass __func__ as
argument where it makes sense.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Christoph Hellwig 2011-10-10 16:52:49 +00:00 committed by Alex Elder
parent 4347b9d7ad
commit 901796afca
9 changed files with 37 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/xfs/xfs_buf.c
View File

@ -1004,6 +1004,17 @@ xfs_buf_ioerror(
trace_xfs_buf_ioerror(bp, error, _RET_IP_); trace_xfs_buf_ioerror(bp, error, _RET_IP_);
} }
void
xfs_buf_ioerror_alert(
struct xfs_buf *bp,
const char *func)
{
xfs_alert(bp->b_target->bt_mount,
"metadata I/O error: block 0x%llx (\"%s\") error %d buf count %zd",
(__uint64_t)XFS_BUF_ADDR(bp), func,
bp->b_error, XFS_BUF_COUNT(bp));
}
int int
xfs_bwrite( xfs_bwrite(
struct xfs_buf *bp) struct xfs_buf *bp)

1
fs/xfs/xfs_buf.h
View File

@ -205,6 +205,7 @@ extern int xfs_bdstrat_cb(struct xfs_buf *);
extern void xfs_buf_ioend(xfs_buf_t *, int); extern void xfs_buf_ioend(xfs_buf_t *, int);
extern void xfs_buf_ioerror(xfs_buf_t *, int); extern void xfs_buf_ioerror(xfs_buf_t *, int);
extern void xfs_buf_ioerror_alert(struct xfs_buf *, const char *func);
extern int xfs_buf_iorequest(xfs_buf_t *); extern int xfs_buf_iorequest(xfs_buf_t *);
extern int xfs_buf_iowait(xfs_buf_t *); extern int xfs_buf_iowait(xfs_buf_t *);
extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *, extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *,

14
fs/xfs/xfs_log.c
View File

@ -880,7 +880,7 @@ xlog_iodone(xfs_buf_t *bp)
*/ */
if (XFS_TEST_ERROR((xfs_buf_geterror(bp)), l->l_mp, if (XFS_TEST_ERROR((xfs_buf_geterror(bp)), l->l_mp,
XFS_ERRTAG_IODONE_IOERR, XFS_RANDOM_IODONE_IOERR)) { XFS_ERRTAG_IODONE_IOERR, XFS_RANDOM_IODONE_IOERR)) {
xfs_ioerror_alert("xlog_iodone", l->l_mp, bp, XFS_BUF_ADDR(bp)); xfs_buf_ioerror_alert(bp, __func__);
xfs_buf_stale(bp); xfs_buf_stale(bp);
xfs_force_shutdown(l->l_mp, SHUTDOWN_LOG_IO_ERROR); xfs_force_shutdown(l->l_mp, SHUTDOWN_LOG_IO_ERROR);
/* /*
@ -1387,9 +1387,9 @@ xlog_sync(xlog_t *log,
*/ */
XFS_BUF_WRITE(bp); XFS_BUF_WRITE(bp);
if ((error = xlog_bdstrat(bp))) { error = xlog_bdstrat(bp);
xfs_ioerror_alert("xlog_sync", log->l_mp, bp, if (error) {
XFS_BUF_ADDR(bp)); xfs_buf_ioerror_alert(bp, "xlog_sync");
return error; return error;
} }
if (split) { if (split) {
@ -1423,9 +1423,9 @@ xlog_sync(xlog_t *log,
/* account for internal log which doesn't start at block #0 */ /* account for internal log which doesn't start at block #0 */
XFS_BUF_SET_ADDR(bp, XFS_BUF_ADDR(bp) + log->l_logBBstart); XFS_BUF_SET_ADDR(bp, XFS_BUF_ADDR(bp) + log->l_logBBstart);
XFS_BUF_WRITE(bp); XFS_BUF_WRITE(bp);
if ((error = xlog_bdstrat(bp))) { error = xlog_bdstrat(bp);
xfs_ioerror_alert("xlog_sync (split)", log->l_mp, if (error) {
bp, XFS_BUF_ADDR(bp)); xfs_buf_ioerror_alert(bp, "xlog_sync (split)");
return error; return error;
} }
} }

25
fs/xfs/xfs_log_recover.c
View File

@ -183,8 +183,7 @@ xlog_bread_noalign(
xfsbdstrat(log->l_mp, bp); xfsbdstrat(log->l_mp, bp);
error = xfs_buf_iowait(bp); error = xfs_buf_iowait(bp);
if (error) if (error)
xfs_ioerror_alert("xlog_bread", log->l_mp, xfs_buf_ioerror_alert(bp, __func__);
bp, XFS_BUF_ADDR(bp));
return error; return error;
} }
@ -269,10 +268,8 @@ xlog_bwrite(
XFS_BUF_SET_COUNT(bp, BBTOB(nbblks)); XFS_BUF_SET_COUNT(bp, BBTOB(nbblks));
error = xfs_bwrite(bp); error = xfs_bwrite(bp);
if (error) { if (error)
xfs_ioerror_alert("xlog_bwrite", log->l_mp, xfs_buf_ioerror_alert(bp, __func__);
bp, XFS_BUF_ADDR(bp));
}
xfs_buf_relse(bp); xfs_buf_relse(bp);
return error; return error;
} }
@ -364,9 +361,7 @@ xlog_recover_iodone(
* We're not going to bother about retrying * We're not going to bother about retrying
* this during recovery. One strike! * this during recovery. One strike!
*/ */
xfs_ioerror_alert("xlog_recover_iodone", xfs_buf_ioerror_alert(bp, __func__);
bp->b_target->bt_mount, bp,
XFS_BUF_ADDR(bp));
xfs_force_shutdown(bp->b_target->bt_mount, xfs_force_shutdown(bp->b_target->bt_mount,
SHUTDOWN_META_IO_ERROR); SHUTDOWN_META_IO_ERROR);
} }
@ -2138,8 +2133,7 @@ xlog_recover_buffer_pass2(
return XFS_ERROR(ENOMEM); return XFS_ERROR(ENOMEM);
error = bp->b_error; error = bp->b_error;
if (error) { if (error) {
xfs_ioerror_alert("xlog_recover_do..(read#1)", mp, xfs_buf_ioerror_alert(bp, "xlog_recover_do..(read#1)");
bp, buf_f->blf_blkno);
xfs_buf_relse(bp); xfs_buf_relse(bp);
return error; return error;
} }
@ -2234,8 +2228,7 @@ xlog_recover_inode_pass2(
} }
error = bp->b_error; error = bp->b_error;
if (error) { if (error) {
xfs_ioerror_alert("xlog_recover_do..(read#2)", mp, xfs_buf_ioerror_alert(bp, "xlog_recover_do..(read#2)");
bp, in_f->ilf_blkno);
xfs_buf_relse(bp); xfs_buf_relse(bp);
goto error; goto error;
} }
@ -2542,8 +2535,7 @@ xlog_recover_dquot_pass2(
XFS_FSB_TO_BB(mp, dq_f->qlf_len), XFS_FSB_TO_BB(mp, dq_f->qlf_len),
0, &bp); 0, &bp);
if (error) { if (error) {
xfs_ioerror_alert("xlog_recover_do..(read#3)", mp, xfs_buf_ioerror_alert(bp, "xlog_recover_do..(read#3)");
bp, dq_f->qlf_blkno);
return error; return error;
} }
ASSERT(bp); ASSERT(bp);
@ -3695,8 +3687,7 @@ xlog_do_recover(
xfsbdstrat(log->l_mp, bp); xfsbdstrat(log->l_mp, bp);
error = xfs_buf_iowait(bp); error = xfs_buf_iowait(bp);
if (error) { if (error) {
xfs_ioerror_alert("xlog_do_recover", xfs_buf_ioerror_alert(bp, __func__);
log->l_mp, bp, XFS_BUF_ADDR(bp));
ASSERT(0); ASSERT(0);
xfs_buf_relse(bp); xfs_buf_relse(bp);
return error; return error;

3
fs/xfs/xfs_mount.c
View File

@ -1610,8 +1610,7 @@ xfs_unmountfs_writesb(xfs_mount_t *mp)
xfsbdstrat(mp, sbp); xfsbdstrat(mp, sbp);
error = xfs_buf_iowait(sbp); error = xfs_buf_iowait(sbp);
if (error) if (error)
xfs_ioerror_alert("xfs_unmountfs_writesb", xfs_buf_ioerror_alert(sbp, __func__);
mp, sbp, XFS_BUF_ADDR(sbp));
xfs_buf_relse(sbp); xfs_buf_relse(sbp);
} }
return error; return error;

20
fs/xfs/xfs_rw.c
View File

@ -91,24 +91,6 @@ xfs_do_force_shutdown(
} }
} }
/*
* Prints out an ALERT message about I/O error.
*/
void
xfs_ioerror_alert(
char *func,
struct xfs_mount *mp,
xfs_buf_t *bp,
xfs_daddr_t blkno)
{
xfs_alert(mp,
"I/O error occurred: meta-data dev %s block 0x%llx"
" (\"%s\") error %d buf count %zd",
xfs_buf_target_name(bp->b_target),
(__uint64_t)blkno, func,
bp->b_error, XFS_BUF_COUNT(bp));
}
/* /*
* This isn't an absolute requirement, but it is * This isn't an absolute requirement, but it is
* just a good idea to call xfs_read_buf instead of * just a good idea to call xfs_read_buf instead of
@ -143,7 +125,7 @@ xfs_read_buf(
} else { } else {
*bpp = NULL; *bpp = NULL;
if (error) { if (error) {
xfs_ioerror_alert("xfs_read_buf", mp, bp, XFS_BUF_ADDR(bp)); xfs_buf_ioerror_alert(bp, __func__);
} else { } else {
error = XFS_ERROR(EIO); error = XFS_ERROR(EIO);
} }

2
fs/xfs/xfs_rw.h
View File

@ -42,8 +42,6 @@ xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb)
extern int xfs_read_buf(struct xfs_mount *mp, xfs_buftarg_t *btp, extern int xfs_read_buf(struct xfs_mount *mp, xfs_buftarg_t *btp,
xfs_daddr_t blkno, int len, uint flags, xfs_daddr_t blkno, int len, uint flags,
struct xfs_buf **bpp); struct xfs_buf **bpp);
extern void xfs_ioerror_alert(char *func, struct xfs_mount *mp,
xfs_buf_t *bp, xfs_daddr_t blkno);
extern xfs_extlen_t xfs_get_extsz_hint(struct xfs_inode *ip); extern xfs_extlen_t xfs_get_extsz_hint(struct xfs_inode *ip);
#endif /* __XFS_RW_H__ */ #endif /* __XFS_RW_H__ */

9
fs/xfs/xfs_trans_buf.c
View File

@ -296,8 +296,7 @@ xfs_trans_read_buf(
if (bp->b_error) { if (bp->b_error) {
error = bp->b_error; error = bp->b_error;
xfs_ioerror_alert("xfs_trans_read_buf", mp, xfs_buf_ioerror_alert(bp, __func__);
bp, blkno);
xfs_buf_relse(bp); xfs_buf_relse(bp);
return error; return error;
} }
@ -339,8 +338,7 @@ xfs_trans_read_buf(
xfsbdstrat(tp->t_mountp, bp); xfsbdstrat(tp->t_mountp, bp);
error = xfs_buf_iowait(bp); error = xfs_buf_iowait(bp);
if (error) { if (error) {
xfs_ioerror_alert("xfs_trans_read_buf", mp, xfs_buf_ioerror_alert(bp, __func__);
bp, blkno);
xfs_buf_relse(bp); xfs_buf_relse(bp);
/* /*
* We can gracefully recover from most read * We can gracefully recover from most read
@ -391,8 +389,7 @@ xfs_trans_read_buf(
error = bp->b_error; error = bp->b_error;
xfs_buf_stale(bp); xfs_buf_stale(bp);
XFS_BUF_DONE(bp); XFS_BUF_DONE(bp);
xfs_ioerror_alert("xfs_trans_read_buf", mp, xfs_buf_ioerror_alert(bp, __func__);
bp, blkno);
if (tp->t_flags & XFS_TRANS_DIRTY) if (tp->t_flags & XFS_TRANS_DIRTY)
xfs_force_shutdown(tp->t_mountp, SHUTDOWN_META_IO_ERROR); xfs_force_shutdown(tp->t_mountp, SHUTDOWN_META_IO_ERROR);
xfs_buf_relse(bp); xfs_buf_relse(bp);

11
fs/xfs/xfs_vnodeops.c
View File

@ -87,8 +87,7 @@ xfs_readlink_bmap(
return XFS_ERROR(ENOMEM); return XFS_ERROR(ENOMEM);
error = bp->b_error; error = bp->b_error;
if (error) { if (error) {
xfs_ioerror_alert("xfs_readlink", xfs_buf_ioerror_alert(bp, __func__);
ip->i_mount, bp, XFS_BUF_ADDR(bp));
xfs_buf_relse(bp); xfs_buf_relse(bp);
goto out; goto out;
} }
@ -1993,8 +1992,8 @@ xfs_zero_remaining_bytes(
xfsbdstrat(mp, bp); xfsbdstrat(mp, bp);
error = xfs_buf_iowait(bp); error = xfs_buf_iowait(bp);
if (error) { if (error) {
xfs_ioerror_alert("xfs_zero_remaining_bytes(read)", xfs_buf_ioerror_alert(bp,
mp, bp, XFS_BUF_ADDR(bp)); "xfs_zero_remaining_bytes(read)");
break; break;
} }
memset(bp->b_addr + memset(bp->b_addr +
@ -2006,8 +2005,8 @@ xfs_zero_remaining_bytes(
xfsbdstrat(mp, bp); xfsbdstrat(mp, bp);
error = xfs_buf_iowait(bp); error = xfs_buf_iowait(bp);
if (error) { if (error) {
xfs_ioerror_alert("xfs_zero_remaining_bytes(write)", xfs_buf_ioerror_alert(bp,
mp, bp, XFS_BUF_ADDR(bp)); "xfs_zero_remaining_bytes(write)");
break; break;
} }
} }