btrfs: stop tracking failed reads in the I/O tree

There is a separate I/O failure tree to track the fail reads, so remove
the extra EXTENT_DAMAGED bit in the I/O tree as it's set but never used.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index bcc8f6b05c03a80316031e5b39dc69c70a00133a..a855f40dd61d49804cd2f13f174c66a32e02a2f8 100644 (file)
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -17,7 +17,6 @@ struct io_failure_record;
 #define EXTENT_NODATASUM       (1U << 7)
 #define EXTENT_CLEAR_META_RESV (1U << 8)
 #define EXTENT_NEED_WAIT       (1U << 9)
-#define EXTENT_DAMAGED         (1U << 10)
 #define EXTENT_NORESERVE       (1U << 11)
 #define EXTENT_QGROUP_RESERVED (1U << 12)
 #define EXTENT_CLEAR_DATA_RESV (1U << 13)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index b503635e1e825a331b29eb9747689afa236e8bba..96546586785a26a0f4d22da7d0e5e56c3342e747 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -519,20 +519,14 @@ static struct io_failure_record *get_failrec(struct btrfs_inode *inode, u64 star
        return failrec;
 }
 
-static int free_io_failure(struct btrfs_inode *inode,
-                          struct io_failure_record *rec)
+static void free_io_failure(struct btrfs_inode *inode,
+                           struct io_failure_record *rec)
 {
-       int ret;
-
        spin_lock(&inode->io_failure_lock);
        rb_erase(&rec->rb_node, &inode->io_failure_tree);
        spin_unlock(&inode->io_failure_lock);
 
-       ret = clear_extent_bits(&inode->io_tree, rec->bytenr,
-                               rec->bytenr + rec->len - 1,
-                               EXTENT_DAMAGED);
        kfree(rec);
-       return ret;
 }
 
 /*
@@ -742,7 +736,6 @@ static struct io_failure_record *btrfs_get_io_failure_record(struct inode *inode
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        u64 start = bbio->file_offset + bio_offset;
        struct io_failure_record *failrec;
-       struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
        const u32 sectorsize = fs_info->sectorsize;
        int ret;
 
@@ -796,12 +789,6 @@ static struct io_failure_record *btrfs_get_io_failure_record(struct inode *inode
                kfree(failrec);
                return ERR_PTR(ret);
        }
-       ret = set_extent_bits(tree, start, start + sectorsize - 1,
-                             EXTENT_DAMAGED);
-       if (ret) {
-               free_io_failure(BTRFS_I(inode), failrec);
-               return ERR_PTR(ret);
-       }
 
        return failrec;
 }

diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index 4c824b7f07dd2487042a29ca16051d5942d95a64..f69ec4d2d6eb293cf1387b93c9aae81870ffe1c4 100644 (file)
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -80,7 +80,6 @@ static void extent_flag_to_str(const struct extent_state *state, char *dest)
        PRINT_ONE_FLAG(state, dest, cur, NODATASUM);
        PRINT_ONE_FLAG(state, dest, cur, CLEAR_META_RESV);
        PRINT_ONE_FLAG(state, dest, cur, NEED_WAIT);
-       PRINT_ONE_FLAG(state, dest, cur, DAMAGED);
        PRINT_ONE_FLAG(state, dest, cur, NORESERVE);
        PRINT_ONE_FLAG(state, dest, cur, QGROUP_RESERVED);
        PRINT_ONE_FLAG(state, dest, cur, CLEAR_DATA_RESV);

diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 4db905311d679e2ff4ad27b9034e334a095ab681..ed50e81174bf43ac92f14be429b316d4845a034c 100644 (file)
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -153,7 +153,6 @@ FLUSH_STATES
        { EXTENT_NODATASUM,             "NODATASUM"},           \
        { EXTENT_CLEAR_META_RESV,       "CLEAR_META_RESV"},     \
        { EXTENT_NEED_WAIT,             "NEED_WAIT"},           \
-       { EXTENT_DAMAGED,               "DAMAGED"},             \
        { EXTENT_NORESERVE,             "NORESERVE"},           \
        { EXTENT_QGROUP_RESERVED,       "QGROUP_RESERVED"},     \
        { EXTENT_CLEAR_DATA_RESV,       "CLEAR_DATA_RESV"},     \