btrfs: get fs_info from eb in repair_eb_io_failure

We can read fs_info from extent buffer and can drop it from the
parameters. As all callsites are updated, add the btrfs_ prefix as the
function is exported.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index b29bb6e1a283521f7a7970a8ce398e9f5c4f5a57..9c5b87bc0813c8e3a8fe64ef2f8755180d84ee23 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -497,7 +497,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_fs_info *fs_info,
        }
 
        if (failed && !ret && failed_mirror)
        }
 
        if (failed && !ret && failed_mirror)

-               repair_eb_io_failure(fs_info, eb, failed_mirror);
+               btrfs_repair_eb_io_failure(eb, failed_mirror);

 
        return ret;
 }
 
        return ret;
 }

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 853a5fcec1932f2e9af3bed8c683beffd6b5fd5f..276c9250ca230d6b1924c0bf3c2b2beaf9c93b75 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2089,9 +2089,9 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
        return 0;
 }
 
        return 0;
 }
 

-int repair_eb_io_failure(struct btrfs_fs_info *fs_info,
-                        struct extent_buffer *eb, int mirror_num)
+int btrfs_repair_eb_io_failure(struct extent_buffer *eb, int mirror_num)

 {
 {

+       struct btrfs_fs_info *fs_info = eb->fs_info;

        u64 start = eb->start;
        int i, num_pages = num_extent_pages(eb);
        int ret = 0;
        u64 start = eb->start;
        int i, num_pages = num_extent_pages(eb);
        int ret = 0;

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 586baed0378056f37eb2bfefb18597fec783b13a..c4ec104ac15705df29ebde9b07a20b95f492f9d3 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -502,8 +502,7 @@ int clean_io_failure(struct btrfs_fs_info *fs_info,
                     struct extent_io_tree *io_tree, u64 start,
                     struct page *page, u64 ino, unsigned int pg_offset);
 void end_extent_writepage(struct page *page, int err, u64 start, u64 end);
                     struct extent_io_tree *io_tree, u64 start,
                     struct page *page, u64 ino, unsigned int pg_offset);
 void end_extent_writepage(struct page *page, int err, u64 start, u64 end);

-int repair_eb_io_failure(struct btrfs_fs_info *fs_info,
-                        struct extent_buffer *eb, int mirror_num);
+int btrfs_repair_eb_io_failure(struct extent_buffer *eb, int mirror_num);

 
 /*
  * When IO fails, either with EIO or csum verification fails, we
 
 /*
  * When IO fails, either with EIO or csum verification fails, we