]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
jbd2: remove unused return value of do_readahead
authorKemeng Shi <shikemeng@huaweicloud.com>
Thu, 23 Jan 2025 15:50:11 +0000 (23:50 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 13 Mar 2025 14:41:21 +0000 (10:41 -0400)
Remove unused return value of do_readahead.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20250123155014.2097920-4-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/jbd2/recovery.c

index 7c23a8be673fb34f39a008e594841ea3134c672f..38a89a3310b245fee9253613d5380072e0aaa759 100644 (file)
@@ -65,9 +65,8 @@ static void journal_brelse_array(struct buffer_head *b[], int n)
  */
 
 #define MAXBUF 8
-static int do_readahead(journal_t *journal, unsigned int start)
+static void do_readahead(journal_t *journal, unsigned int start)
 {
-       int err;
        unsigned int max, nbufs, next;
        unsigned long long blocknr;
        struct buffer_head *bh;
@@ -85,7 +84,7 @@ static int do_readahead(journal_t *journal, unsigned int start)
        nbufs = 0;
 
        for (next = start; next < max; next++) {
-               err = jbd2_journal_bmap(journal, next, &blocknr);
+               int err = jbd2_journal_bmap(journal, next, &blocknr);
 
                if (err) {
                        printk(KERN_ERR "JBD2: bad block at offset %u\n",
@@ -94,10 +93,8 @@ static int do_readahead(journal_t *journal, unsigned int start)
                }
 
                bh = __getblk(journal->j_dev, blocknr, journal->j_blocksize);
-               if (!bh) {
-                       err = -ENOMEM;
+               if (!bh)
                        goto failed;
-               }
 
                if (!buffer_uptodate(bh) && !buffer_locked(bh)) {
                        bufs[nbufs++] = bh;
@@ -112,12 +109,10 @@ static int do_readahead(journal_t *journal, unsigned int start)
 
        if (nbufs)
                bh_readahead_batch(nbufs, bufs, 0);
-       err = 0;
 
 failed:
        if (nbufs)
                journal_brelse_array(bufs, nbufs);
-       return err;
 }
 
 #endif /* __KERNEL__ */