@@ -65,9 +65,8 @@ static void journal_brelse_array(struct buffer_head *b[], int n)
6565 */
6666
6767#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 )
6969{
70- int err ;
7170 unsigned int max , nbufs , next ;
7271 unsigned long long blocknr ;
7372 struct buffer_head * bh ;
@@ -85,7 +84,7 @@ static int do_readahead(journal_t *journal, unsigned int start)
8584 nbufs = 0 ;
8685
8786 for (next = start ; next < max ; next ++ ) {
88- err = jbd2_journal_bmap (journal , next , & blocknr );
87+ int err = jbd2_journal_bmap (journal , next , & blocknr );
8988
9089 if (err ) {
9190 printk (KERN_ERR "JBD2: bad block at offset %u\n" ,
@@ -94,10 +93,8 @@ static int do_readahead(journal_t *journal, unsigned int start)
9493 }
9594
9695 bh = __getblk (journal -> j_dev , blocknr , journal -> j_blocksize );
97- if (!bh ) {
98- err = - ENOMEM ;
96+ if (!bh )
9997 goto failed ;
100- }
10198
10299 if (!buffer_uptodate (bh ) && !buffer_locked (bh )) {
103100 bufs [nbufs ++ ] = bh ;
@@ -112,12 +109,10 @@ static int do_readahead(journal_t *journal, unsigned int start)
112109
113110 if (nbufs )
114111 bh_readahead_batch (nbufs , bufs , 0 );
115- err = 0 ;
116112
117113failed :
118114 if (nbufs )
119115 journal_brelse_array (bufs , nbufs );
120- return err ;
121116}
122117
123118#endif /* __KERNEL__ */
0 commit comments