@@ -65,9 +65,8 @@ static void journal_brelse_array(struct buffer_head *b[], int n)
65
65
*/
66
66
67
67
#define MAXBUF 8
68
- static int do_readahead (journal_t * journal , unsigned int start )
68
+ static void do_readahead (journal_t * journal , unsigned int start )
69
69
{
70
- int err ;
71
70
unsigned int max , nbufs , next ;
72
71
unsigned long long blocknr ;
73
72
struct buffer_head * bh ;
@@ -85,7 +84,7 @@ static int do_readahead(journal_t *journal, unsigned int start)
85
84
nbufs = 0 ;
86
85
87
86
for (next = start ; next < max ; next ++ ) {
88
- err = jbd2_journal_bmap (journal , next , & blocknr );
87
+ int err = jbd2_journal_bmap (journal , next , & blocknr );
89
88
90
89
if (err ) {
91
90
printk (KERN_ERR "JBD2: bad block at offset %u\n" ,
@@ -94,10 +93,8 @@ static int do_readahead(journal_t *journal, unsigned int start)
94
93
}
95
94
96
95
bh = __getblk (journal -> j_dev , blocknr , journal -> j_blocksize );
97
- if (!bh ) {
98
- err = - ENOMEM ;
96
+ if (!bh )
99
97
goto failed ;
100
- }
101
98
102
99
if (!buffer_uptodate (bh ) && !buffer_locked (bh )) {
103
100
bufs [nbufs ++ ] = bh ;
@@ -112,12 +109,10 @@ static int do_readahead(journal_t *journal, unsigned int start)
112
109
113
110
if (nbufs )
114
111
bh_readahead_batch (nbufs , bufs , 0 );
115
- err = 0 ;
116
112
117
113
failed :
118
114
if (nbufs )
119
115
journal_brelse_array (bufs , nbufs );
120
- return err ;
121
116
}
122
117
123
118
#endif /* __KERNEL__ */
0 commit comments