Btrfs: record error if one block has failed to retry

In the nocsum case of dio read endio, it returns immediately if an error
gets returned when repairing, which leaves the rest blocks unrepaired.  The
behavior is different from how buffered read endio works in the same case.
This changes it to record error only and go on repairing the rest blocks.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ce6a9b2cce51df1cb481ba96223910a7ea44e736..d8d1fe5096b7a94df61364ea219ba467cd18d5e2 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8078,6 +8078,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode,
        u32 sectorsize;
        int nr_sectors;
        int ret;
+       int err = 0;
 
        fs_info = BTRFS_I(inode)->root->fs_info;
        sectorsize = fs_info->sectorsize;
@@ -8099,8 +8100,10 @@ static int __btrfs_correct_data_nocsum(struct inode *inode,
                                pgoff, start, start + sectorsize - 1,
                                io_bio->mirror_num,
                                btrfs_retry_endio_nocsum, &done);
-               if (ret)
-                       return ret;
+               if (ret) {
+                       err = ret;
+                       goto next;
+               }
 
                wait_for_completion(&done.done);
 
@@ -8109,6 +8112,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode,
                        goto next_block_or_try_again;
                }
 
+next:
                start += sectorsize;
 
                nr_sectors--;
@@ -8119,7 +8123,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode,
                }
        }
 
-       return 0;
+       return err;
 }
 
 static void btrfs_retry_endio(struct bio *bio)