diff options
| author | Alex Lyakas <alex.bolshoy@gmail.com> | 2016-03-10 13:10:15 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-03-22 10:08:12 +0100 |
| commit | 0f805531daa2ebfb5706422dc2ead1cff9e53e65 (patch) | |
| tree | 67ac073abecb56e21a03d7ec45043578984a6cba /fs/btrfs/disk-io.c | |
| parent | 8bd98f0e6bf792e8fa7c3fed709321ad42ba8d2e (diff) | |
| download | lwn-0f805531daa2ebfb5706422dc2ead1cff9e53e65.tar.gz lwn-0f805531daa2ebfb5706422dc2ead1cff9e53e65.zip | |
btrfs: do not write corrupted metadata blocks to disk
csum_dirty_buffer was issuing a warning in case the extent buffer
did not look alright, but was still returning success.
Let's return error in this case, and also add an additional sanity
check on the extent buffer header.
The caller up the chain may BUG_ON on this, for example flush_epd_write_bio will,
but it is better than to have a silent metadata corruption on disk.
Signed-off-by: Alex Lyakas <alex@zadarastorage.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 9cafae5c2061..8579b35bb160 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -512,9 +512,20 @@ static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct page *page) eb = (struct extent_buffer *)page->private; if (page != eb->pages[0]) return 0; + found_start = btrfs_header_bytenr(eb); - if (WARN_ON(found_start != start || !PageUptodate(page))) - return 0; + /* + * Please do not consolidate these warnings into a single if. + * It is useful to know what went wrong. + */ + if (WARN_ON(found_start != start)) + return -EUCLEAN; + if (WARN_ON(!PageUptodate(page))) + return -EUCLEAN; + + ASSERT(memcmp_extent_buffer(eb, fs_info->fsid, + btrfs_header_fsid(), BTRFS_FSID_SIZE) == 0); + return csum_tree_block(fs_info, eb, 0); } |