diff options
Diffstat (limited to 'fs/xfs/xfs_trans_buf.c')
-rw-r--r-- | fs/xfs/xfs_trans_buf.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c index b8eef0549f3f..96c898e7ac9a 100644 --- a/fs/xfs/xfs_trans_buf.c +++ b/fs/xfs/xfs_trans_buf.c | |||
@@ -166,7 +166,7 @@ xfs_trans_get_buf_map( | |||
166 | ASSERT(atomic_read(&bip->bli_refcount) > 0); | 166 | ASSERT(atomic_read(&bip->bli_refcount) > 0); |
167 | bip->bli_recur++; | 167 | bip->bli_recur++; |
168 | trace_xfs_trans_get_buf_recur(bip); | 168 | trace_xfs_trans_get_buf_recur(bip); |
169 | return (bp); | 169 | return bp; |
170 | } | 170 | } |
171 | 171 | ||
172 | bp = xfs_buf_get_map(target, map, nmaps, flags); | 172 | bp = xfs_buf_get_map(target, map, nmaps, flags); |
@@ -178,7 +178,7 @@ xfs_trans_get_buf_map( | |||
178 | 178 | ||
179 | _xfs_trans_bjoin(tp, bp, 1); | 179 | _xfs_trans_bjoin(tp, bp, 1); |
180 | trace_xfs_trans_get_buf(bp->b_fspriv); | 180 | trace_xfs_trans_get_buf(bp->b_fspriv); |
181 | return (bp); | 181 | return bp; |
182 | } | 182 | } |
183 | 183 | ||
184 | /* | 184 | /* |
@@ -201,9 +201,8 @@ xfs_trans_getsb(xfs_trans_t *tp, | |||
201 | * Default to just trying to lock the superblock buffer | 201 | * Default to just trying to lock the superblock buffer |
202 | * if tp is NULL. | 202 | * if tp is NULL. |
203 | */ | 203 | */ |
204 | if (tp == NULL) { | 204 | if (tp == NULL) |
205 | return (xfs_getsb(mp, flags)); | 205 | return xfs_getsb(mp, flags); |
206 | } | ||
207 | 206 | ||
208 | /* | 207 | /* |
209 | * If the superblock buffer already has this transaction | 208 | * If the superblock buffer already has this transaction |
@@ -218,7 +217,7 @@ xfs_trans_getsb(xfs_trans_t *tp, | |||
218 | ASSERT(atomic_read(&bip->bli_refcount) > 0); | 217 | ASSERT(atomic_read(&bip->bli_refcount) > 0); |
219 | bip->bli_recur++; | 218 | bip->bli_recur++; |
220 | trace_xfs_trans_getsb_recur(bip); | 219 | trace_xfs_trans_getsb_recur(bip); |
221 | return (bp); | 220 | return bp; |
222 | } | 221 | } |
223 | 222 | ||
224 | bp = xfs_getsb(mp, flags); | 223 | bp = xfs_getsb(mp, flags); |
@@ -227,7 +226,7 @@ xfs_trans_getsb(xfs_trans_t *tp, | |||
227 | 226 | ||
228 | _xfs_trans_bjoin(tp, bp, 1); | 227 | _xfs_trans_bjoin(tp, bp, 1); |
229 | trace_xfs_trans_getsb(bp->b_fspriv); | 228 | trace_xfs_trans_getsb(bp->b_fspriv); |
230 | return (bp); | 229 | return bp; |
231 | } | 230 | } |
232 | 231 | ||
233 | #ifdef DEBUG | 232 | #ifdef DEBUG |
@@ -267,7 +266,7 @@ xfs_trans_read_buf_map( | |||
267 | bp = xfs_buf_read_map(target, map, nmaps, flags, ops); | 266 | bp = xfs_buf_read_map(target, map, nmaps, flags, ops); |
268 | if (!bp) | 267 | if (!bp) |
269 | return (flags & XBF_TRYLOCK) ? | 268 | return (flags & XBF_TRYLOCK) ? |
270 | EAGAIN : XFS_ERROR(ENOMEM); | 269 | -EAGAIN : -ENOMEM; |
271 | 270 | ||
272 | if (bp->b_error) { | 271 | if (bp->b_error) { |
273 | error = bp->b_error; | 272 | error = bp->b_error; |
@@ -277,8 +276,8 @@ xfs_trans_read_buf_map( | |||
277 | xfs_buf_relse(bp); | 276 | xfs_buf_relse(bp); |
278 | 277 | ||
279 | /* bad CRC means corrupted metadata */ | 278 | /* bad CRC means corrupted metadata */ |
280 | if (error == EFSBADCRC) | 279 | if (error == -EFSBADCRC) |
281 | error = EFSCORRUPTED; | 280 | error = -EFSCORRUPTED; |
282 | return error; | 281 | return error; |
283 | } | 282 | } |
284 | #ifdef DEBUG | 283 | #ifdef DEBUG |
@@ -287,7 +286,7 @@ xfs_trans_read_buf_map( | |||
287 | if (((xfs_req_num++) % xfs_error_mod) == 0) { | 286 | if (((xfs_req_num++) % xfs_error_mod) == 0) { |
288 | xfs_buf_relse(bp); | 287 | xfs_buf_relse(bp); |
289 | xfs_debug(mp, "Returning error!"); | 288 | xfs_debug(mp, "Returning error!"); |
290 | return XFS_ERROR(EIO); | 289 | return -EIO; |
291 | } | 290 | } |
292 | } | 291 | } |
293 | } | 292 | } |
@@ -343,8 +342,8 @@ xfs_trans_read_buf_map( | |||
343 | xfs_force_shutdown(tp->t_mountp, | 342 | xfs_force_shutdown(tp->t_mountp, |
344 | SHUTDOWN_META_IO_ERROR); | 343 | SHUTDOWN_META_IO_ERROR); |
345 | /* bad CRC means corrupted metadata */ | 344 | /* bad CRC means corrupted metadata */ |
346 | if (error == EFSBADCRC) | 345 | if (error == -EFSBADCRC) |
347 | error = EFSCORRUPTED; | 346 | error = -EFSCORRUPTED; |
348 | return error; | 347 | return error; |
349 | } | 348 | } |
350 | } | 349 | } |
@@ -355,7 +354,7 @@ xfs_trans_read_buf_map( | |||
355 | if (XFS_FORCED_SHUTDOWN(mp)) { | 354 | if (XFS_FORCED_SHUTDOWN(mp)) { |
356 | trace_xfs_trans_read_buf_shut(bp, _RET_IP_); | 355 | trace_xfs_trans_read_buf_shut(bp, _RET_IP_); |
357 | *bpp = NULL; | 356 | *bpp = NULL; |
358 | return XFS_ERROR(EIO); | 357 | return -EIO; |
359 | } | 358 | } |
360 | 359 | ||
361 | 360 | ||
@@ -372,7 +371,7 @@ xfs_trans_read_buf_map( | |||
372 | if (bp == NULL) { | 371 | if (bp == NULL) { |
373 | *bpp = NULL; | 372 | *bpp = NULL; |
374 | return (flags & XBF_TRYLOCK) ? | 373 | return (flags & XBF_TRYLOCK) ? |
375 | 0 : XFS_ERROR(ENOMEM); | 374 | 0 : -ENOMEM; |
376 | } | 375 | } |
377 | if (bp->b_error) { | 376 | if (bp->b_error) { |
378 | error = bp->b_error; | 377 | error = bp->b_error; |
@@ -384,8 +383,8 @@ xfs_trans_read_buf_map( | |||
384 | xfs_buf_relse(bp); | 383 | xfs_buf_relse(bp); |
385 | 384 | ||
386 | /* bad CRC means corrupted metadata */ | 385 | /* bad CRC means corrupted metadata */ |
387 | if (error == EFSBADCRC) | 386 | if (error == -EFSBADCRC) |
388 | error = EFSCORRUPTED; | 387 | error = -EFSCORRUPTED; |
389 | return error; | 388 | return error; |
390 | } | 389 | } |
391 | #ifdef DEBUG | 390 | #ifdef DEBUG |
@@ -396,7 +395,7 @@ xfs_trans_read_buf_map( | |||
396 | SHUTDOWN_META_IO_ERROR); | 395 | SHUTDOWN_META_IO_ERROR); |
397 | xfs_buf_relse(bp); | 396 | xfs_buf_relse(bp); |
398 | xfs_debug(mp, "Returning trans error!"); | 397 | xfs_debug(mp, "Returning trans error!"); |
399 | return XFS_ERROR(EIO); | 398 | return -EIO; |
400 | } | 399 | } |
401 | } | 400 | } |
402 | } | 401 | } |
@@ -414,7 +413,7 @@ shutdown_abort: | |||
414 | trace_xfs_trans_read_buf_shut(bp, _RET_IP_); | 413 | trace_xfs_trans_read_buf_shut(bp, _RET_IP_); |
415 | xfs_buf_relse(bp); | 414 | xfs_buf_relse(bp); |
416 | *bpp = NULL; | 415 | *bpp = NULL; |
417 | return XFS_ERROR(EIO); | 416 | return -EIO; |
418 | } | 417 | } |
419 | 418 | ||
420 | /* | 419 | /* |