btrfs: all btrfs_delalloc_release_metadata take btrfs_inode

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

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 23dcc42..7f7f3b6 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2704,7 +2704,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
 void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
                                      struct btrfs_block_rsv *rsv);
 int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes);
-void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes);
+void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes);
 int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len);
 void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len);
 void btrfs_init_block_rsv(struct btrfs_block_rsv *rsv, unsigned short type);

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 4db3cf4..7b2313a 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6081,27 +6081,27 @@ out_fail:
  * once we complete IO for a given set of bytes to release their metadata
  * reservations.
  */
-void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes)
+void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes)
 {
-       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
        u64 to_free = 0;
        unsigned dropped;
 
        num_bytes = ALIGN(num_bytes, fs_info->sectorsize);
-       spin_lock(&BTRFS_I(inode)->lock);
-       dropped = drop_outstanding_extent(BTRFS_I(inode), num_bytes);
+       spin_lock(&inode->lock);
+       dropped = drop_outstanding_extent(inode, num_bytes);
 
        if (num_bytes)
-               to_free = calc_csum_metadata_size(BTRFS_I(inode), num_bytes, 0);
-       spin_unlock(&BTRFS_I(inode)->lock);
+               to_free = calc_csum_metadata_size(inode, num_bytes, 0);
+       spin_unlock(&inode->lock);
        if (dropped > 0)
                to_free += btrfs_calc_trans_metadata_size(fs_info, dropped);
 
        if (btrfs_is_testing(fs_info))
                return;
 
-       trace_btrfs_space_reservation(fs_info, "delalloc",
-                                     btrfs_ino(BTRFS_I(inode)), to_free, 0);
+       trace_btrfs_space_reservation(fs_info, "delalloc", btrfs_ino(inode),
+                                     to_free, 0);
 
        btrfs_block_rsv_release(fs_info, &fs_info->delalloc_block_rsv, to_free);
 }
@@ -6159,7 +6159,7 @@ int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len)
  */
 void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len)
 {
-       btrfs_delalloc_release_metadata(inode, len);
+       btrfs_delalloc_release_metadata(BTRFS_I(inode), len);
        btrfs_free_reserved_data_space(inode, start, len);
 }
 

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index e32a920..0e30d14 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1678,7 +1678,7 @@ again:
                                spin_unlock(&BTRFS_I(inode)->lock);
                        }
                        if (only_release_metadata) {
-                               btrfs_delalloc_release_metadata(inode,
+                               btrfs_delalloc_release_metadata(BTRFS_I(inode),
                                                                release_bytes);
                        } else {
                                u64 __pos;
@@ -1739,7 +1739,8 @@ again:
        if (release_bytes) {
                if (only_release_metadata) {
                        btrfs_end_write_no_snapshoting(root);
-                       btrfs_delalloc_release_metadata(inode, release_bytes);
+                       btrfs_delalloc_release_metadata(BTRFS_I(inode),
+                                       release_bytes);
                } else {
                        btrfs_delalloc_release_space(inode,
                                                round_down(pos, fs_info->sectorsize),

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index c0f313c..7dcf0b1 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -3545,7 +3545,8 @@ int btrfs_write_out_ino_cache(struct btrfs_root *root,
 
        if (ret) {
                if (release_metadata)
-                       btrfs_delalloc_release_metadata(inode, inode->i_size);
+                       btrfs_delalloc_release_metadata(BTRFS_I(inode),
+                                       inode->i_size);
 #ifdef DEBUG
                btrfs_err(fs_info,
                          "failed to write free ino cache for root %llu",

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 3bbb8f0..5c6c20e 100644 (file)
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -499,7 +499,7 @@ again:
        ret = btrfs_prealloc_file_range_trans(inode, trans, 0, 0, prealloc,
                                              prealloc, prealloc, &alloc_hint);
        if (ret) {
-               btrfs_delalloc_release_metadata(inode, prealloc);
+               btrfs_delalloc_release_metadata(BTRFS_I(inode), prealloc);
                goto out_put;
        }
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8a14b47..dd0f1ab 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -316,7 +316,7 @@ static noinline int cow_file_range_inline(struct btrfs_root *root,
        }
 
        set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &BTRFS_I(inode)->runtime_flags);
-       btrfs_delalloc_release_metadata(inode, end + 1 - start);
+       btrfs_delalloc_release_metadata(BTRFS_I(inode), end + 1 - start);
        btrfs_drop_extent_cache(inode, start, aligned_end - 1, 0);
 out:
        /*
@@ -1737,7 +1737,7 @@ static void btrfs_clear_bit_hook(struct inode *inode,
                 */
                if (*bits & EXTENT_DO_ACCOUNTING &&
                    root != fs_info->tree_root)
-                       btrfs_delalloc_release_metadata(inode, len);
+                       btrfs_delalloc_release_metadata(BTRFS_I(inode), len);
 
                /* For sanity tests. */
                if (btrfs_is_testing(fs_info))
@@ -2914,7 +2914,8 @@ out_unlock:
                             ordered_extent->len - 1, &cached_state, GFP_NOFS);
 out:
        if (root != fs_info->tree_root)
-               btrfs_delalloc_release_metadata(inode, ordered_extent->len);
+               btrfs_delalloc_release_metadata(BTRFS_I(inode),
+                               ordered_extent->len);
        if (trans)
                btrfs_end_transaction(trans);
 

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 4ee1490..e647089 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3216,7 +3216,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
                        page = find_or_create_page(inode->i_mapping, index,
                                                   mask);
                        if (!page) {
-                               btrfs_delalloc_release_metadata(inode,
+                               btrfs_delalloc_release_metadata(BTRFS_I(inode),
                                                        PAGE_SIZE);
                                ret = -ENOMEM;
                                goto out;
@@ -3235,7 +3235,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
                        if (!PageUptodate(page)) {
                                unlock_page(page);
                                put_page(page);
-                               btrfs_delalloc_release_metadata(inode,
+                               btrfs_delalloc_release_metadata(BTRFS_I(inode),
                                                        PAGE_SIZE);
                                ret = -EIO;
                                goto out;