diff options
Diffstat (limited to 'fs/xfs/xfs_rw.c')
-rw-r--r-- | fs/xfs/xfs_rw.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/fs/xfs/xfs_rw.c b/fs/xfs/xfs_rw.c index c96a8a05ac03..597d044a09a1 100644 --- a/fs/xfs/xfs_rw.c +++ b/fs/xfs/xfs_rw.c | |||
@@ -92,24 +92,6 @@ xfs_do_force_shutdown( | |||
92 | } | 92 | } |
93 | 93 | ||
94 | /* | 94 | /* |
95 | * Prints out an ALERT message about I/O error. | ||
96 | */ | ||
97 | void | ||
98 | xfs_ioerror_alert( | ||
99 | char *func, | ||
100 | struct xfs_mount *mp, | ||
101 | xfs_buf_t *bp, | ||
102 | xfs_daddr_t blkno) | ||
103 | { | ||
104 | xfs_alert(mp, | ||
105 | "I/O error occurred: meta-data dev %s block 0x%llx" | ||
106 | " (\"%s\") error %d buf count %zd", | ||
107 | xfs_buf_target_name(bp->b_target), | ||
108 | (__uint64_t)blkno, func, | ||
109 | bp->b_error, XFS_BUF_COUNT(bp)); | ||
110 | } | ||
111 | |||
112 | /* | ||
113 | * This isn't an absolute requirement, but it is | 95 | * This isn't an absolute requirement, but it is |
114 | * just a good idea to call xfs_read_buf instead of | 96 | * just a good idea to call xfs_read_buf instead of |
115 | * directly doing a read_buf call. For one, we shouldn't | 97 | * directly doing a read_buf call. For one, we shouldn't |
@@ -143,14 +125,13 @@ xfs_read_buf( | |||
143 | } else { | 125 | } else { |
144 | *bpp = NULL; | 126 | *bpp = NULL; |
145 | if (error) { | 127 | if (error) { |
146 | xfs_ioerror_alert("xfs_read_buf", mp, bp, XFS_BUF_ADDR(bp)); | 128 | xfs_buf_ioerror_alert(bp, __func__); |
147 | } else { | 129 | } else { |
148 | error = XFS_ERROR(EIO); | 130 | error = XFS_ERROR(EIO); |
149 | } | 131 | } |
150 | if (bp) { | 132 | if (bp) { |
151 | XFS_BUF_UNDONE(bp); | 133 | XFS_BUF_UNDONE(bp); |
152 | XFS_BUF_UNDELAYWRITE(bp); | 134 | xfs_buf_stale(bp); |
153 | XFS_BUF_STALE(bp); | ||
154 | /* | 135 | /* |
155 | * brelse clears B_ERROR and b_error | 136 | * brelse clears B_ERROR and b_error |
156 | */ | 137 | */ |