| stree.c (8c57a5e7b2820f349c95b8c8393fec1e0f4070d2) | stree.c (70246286e94c335b5bea0cbc68a17a96dd620281) |
|---|---|
| 1/* 2 * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README 3 */ 4 5/* 6 * Written by Anatoly P. Pinchuk pap@namesys.botik.ru 7 * Programm System Institute 8 * Pereslavl-Zalessky Russia --- 537 unchanged lines hidden (view full) --- 546 /* 547 * note, this needs attention if we are getting rid of the BKL 548 * you have to make sure the prepared bit isn't set on this 549 * buffer 550 */ 551 if (!buffer_uptodate(bh[j])) { 552 if (depth == -1) 553 depth = reiserfs_write_unlock_nested(s); | 1/* 2 * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README 3 */ 4 5/* 6 * Written by Anatoly P. Pinchuk pap@namesys.botik.ru 7 * Programm System Institute 8 * Pereslavl-Zalessky Russia --- 537 unchanged lines hidden (view full) --- 546 /* 547 * note, this needs attention if we are getting rid of the BKL 548 * you have to make sure the prepared bit isn't set on this 549 * buffer 550 */ 551 if (!buffer_uptodate(bh[j])) { 552 if (depth == -1) 553 depth = reiserfs_write_unlock_nested(s); |
| 554 ll_rw_block(READA, 1, bh + j); | 554 ll_rw_block(REQ_OP_READ, REQ_RAHEAD, 1, bh + j); |
| 555 } 556 brelse(bh[j]); 557 } 558 return depth; 559} 560 561/* 562 * This function fills up the path from the root to the leaf as it --- 92 unchanged lines hidden (view full) --- 655 656 if (!buffer_uptodate(bh) && reada_count > 1) 657 depth = search_by_key_reada(sb, reada_bh, 658 reada_blocks, reada_count); 659 660 if (!buffer_uptodate(bh) && depth == -1) 661 depth = reiserfs_write_unlock_nested(sb); 662 | 555 } 556 brelse(bh[j]); 557 } 558 return depth; 559} 560 561/* 562 * This function fills up the path from the root to the leaf as it --- 92 unchanged lines hidden (view full) --- 655 656 if (!buffer_uptodate(bh) && reada_count > 1) 657 depth = search_by_key_reada(sb, reada_bh, 658 reada_blocks, reada_count); 659 660 if (!buffer_uptodate(bh) && depth == -1) 661 depth = reiserfs_write_unlock_nested(sb); 662 |
| 663 ll_rw_block(READ, 1, &bh); | 663 ll_rw_block(REQ_OP_READ, 0, 1, &bh); |
| 664 wait_on_buffer(bh); 665 666 if (depth != -1) 667 reiserfs_write_lock_nested(sb, depth); 668 if (!buffer_uptodate(bh)) 669 goto io_error; 670 } else { 671io_error: --- 1591 unchanged lines hidden --- | 664 wait_on_buffer(bh); 665 666 if (depth != -1) 667 reiserfs_write_lock_nested(sb, depth); 668 if (!buffer_uptodate(bh)) 669 goto io_error; 670 } else { 671io_error: --- 1591 unchanged lines hidden --- |