@@ -345,7 +345,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,
345
345
bh = bh_in ;
346
346
347
347
if (!bh ) {
348
- bh = __find_get_block (bdev , blocknr , journal -> j_blocksize );
348
+ bh = __find_get_block_nonatomic (bdev , blocknr ,
349
+ journal -> j_blocksize );
349
350
if (bh )
350
351
BUFFER_TRACE (bh , "found on hash" );
351
352
}
@@ -355,7 +356,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,
355
356
356
357
/* If there is a different buffer_head lying around in
357
358
* memory anywhere... */
358
- bh2 = __find_get_block (bdev , blocknr , journal -> j_blocksize );
359
+ bh2 = __find_get_block_nonatomic (bdev , blocknr ,
360
+ journal -> j_blocksize );
359
361
if (bh2 ) {
360
362
/* ... and it has RevokeValid status... */
361
363
if (bh2 != bh && buffer_revokevalid (bh2 ))
@@ -464,7 +466,8 @@ void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
464
466
* state machine will get very upset later on. */
465
467
if (need_cancel ) {
466
468
struct buffer_head * bh2 ;
467
- bh2 = __find_get_block (bh -> b_bdev , bh -> b_blocknr , bh -> b_size );
469
+ bh2 = __find_get_block_nonatomic (bh -> b_bdev , bh -> b_blocknr ,
470
+ bh -> b_size );
468
471
if (bh2 ) {
469
472
if (bh2 != bh )
470
473
clear_buffer_revoked (bh2 );
@@ -492,9 +495,9 @@ void jbd2_clear_buffer_revoked_flags(journal_t *journal)
492
495
struct jbd2_revoke_record_s * record ;
493
496
struct buffer_head * bh ;
494
497
record = (struct jbd2_revoke_record_s * )list_entry ;
495
- bh = __find_get_block (journal -> j_fs_dev ,
496
- record -> blocknr ,
497
- journal -> j_blocksize );
498
+ bh = __find_get_block_nonatomic (journal -> j_fs_dev ,
499
+ record -> blocknr ,
500
+ journal -> j_blocksize );
498
501
if (bh ) {
499
502
clear_buffer_revoked (bh );
500
503
__brelse (bh );
0 commit comments