diff options
| author | Liu Bo <bo.liu@linux.alibaba.com> | 2018-03-22 09:20:11 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-03-31 01:41:12 +0200 |
| commit | 580c6efaf91f89fae1efda53892df41ae1e41559 (patch) | |
| tree | 5daf8ab057f86ff3cd71254b3f7f525c5fab9c69 /fs/btrfs | |
| parent | 8a5a916d9a35e13576d79cc16e24611821b13e34 (diff) | |
| download | linux-stable-580c6efaf91f89fae1efda53892df41ae1e41559.tar.gz linux-stable-580c6efaf91f89fae1efda53892df41ae1e41559.tar.bz2 linux-stable-580c6efaf91f89fae1efda53892df41ae1e41559.zip | |
Btrfs: replace: cache rbio when rebuild data on missing device
Rebuild on missing device is as same as recover, after it's done, rbio
has data which is consistent with on-disk data, so it can be cached to
avoid further reads.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/raid56.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 002bddc7fa09..c3a2bc8af675 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -1987,7 +1987,13 @@ cleanup: kfree(pointers); cleanup_io: - if (rbio->operation == BTRFS_RBIO_READ_REBUILD) { + /* + * Similar to READ_REBUILD, REBUILD_MISSING at this point also has a + * valid rbio which is consistent with ondisk content, thus such a + * valid rbio can be cached to avoid further disk reads. + */ + if (rbio->operation == BTRFS_RBIO_READ_REBUILD || + rbio->operation == BTRFS_RBIO_REBUILD_MISSING) { /* * - In case of two failures, where rbio->failb != -1: * @@ -2009,8 +2015,6 @@ cleanup_io: clear_bit(RBIO_CACHE_READY_BIT, &rbio->flags); rbio_orig_end_io(rbio, err); - } else if (rbio->operation == BTRFS_RBIO_REBUILD_MISSING) { - rbio_orig_end_io(rbio, err); } else if (err == BLK_STS_OK) { rbio->faila = -1; rbio->failb = -1; |