btrfs: make btrfs_free_io_failure_record take btrfs_inode

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

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index b08fa96678eeca3c485674b2080288c27672756f..ded750eb90c4769b582fa8f118fbbfd490572801 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2152,9 +2152,9 @@ out:
  * - under ordered extent
  * - the inode is freeing
  */
-void btrfs_free_io_failure_record(struct inode *inode, u64 start, u64 end)
+void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start, u64 end)
 {
-       struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree;
+       struct extent_io_tree *failure_tree = &inode->io_failure_tree;
        struct io_failure_record *failrec;
        struct extent_state *state, *next;
 

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 0f67222f4464311ac39ec33bb67359c1a3ef98de..345fc33f843d80b62e5e9633af2d29ad503e9205 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -482,7 +482,8 @@ struct io_failure_record {
 };
 
 
-void btrfs_free_io_failure_record(struct inode *inode, u64 start, u64 end);
+void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start,
+               u64 end);
 int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
                                struct io_failure_record **failrec_ret);
 int btrfs_check_repairable(struct inode *inode, struct bio *failed_bio,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 4498921bb6085eb5db906209a4c9a8bf1534e1a9..4805489984eb55677700e250c78e30bbbae3f4f7 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2803,9 +2803,10 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
                goto out;
        }
 
-       btrfs_free_io_failure_record(inode, ordered_extent->file_offset,
-                                    ordered_extent->file_offset +
-                                    ordered_extent->len - 1);
+       btrfs_free_io_failure_record(BTRFS_I(inode),
+                       ordered_extent->file_offset,
+                       ordered_extent->file_offset +
+                       ordered_extent->len - 1);
 
        if (test_bit(BTRFS_ORDERED_TRUNCATED, &ordered_extent->flags)) {
                truncated = true;
@@ -5196,7 +5197,7 @@ void btrfs_evict_inode(struct inode *inode)
        if (!special_file(inode->i_mode))
                btrfs_wait_ordered_range(inode, 0, (u64)-1);
 
-       btrfs_free_io_failure_record(inode, 0, (u64)-1);
+       btrfs_free_io_failure_record(BTRFS_I(inode), 0, (u64)-1);
 
        if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags)) {
                BUG_ON(test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,