btrfs: make btrfs_delalloc_release_space take btrfs_inode

It needs btrfs_inode so take it as a parameter directly.

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

diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c
index 8f872ae9732d6548b8501196bcd3c205bb53aa1b..aabc883489c107b0361ae0e336d94757dd6e18f5 100644 (file)
--- a/fs/btrfs/delalloc-space.c
+++ b/fs/btrfs/delalloc-space.c
@@ -579,10 +579,10 @@ int btrfs_delalloc_reserve_space(struct inode *inode,
  * list if there are no delalloc bytes left.
  * Also it will handle the qgroup reserved space.
  */
-void btrfs_delalloc_release_space(struct inode *inode,
+void btrfs_delalloc_release_space(struct btrfs_inode *inode,
                                  struct extent_changeset *reserved,
                                  u64 start, u64 len, bool qgroup_free)
 {
-       btrfs_delalloc_release_metadata(BTRFS_I(inode), len, qgroup_free);
-       btrfs_free_reserved_data_space(BTRFS_I(inode), reserved, start, len);
+       btrfs_delalloc_release_metadata(inode, len, qgroup_free);
+       btrfs_free_reserved_data_space(inode, reserved, start, len);
 }

diff --git a/fs/btrfs/delalloc-space.h b/fs/btrfs/delalloc-space.h
index 57194275923d91759025fe928b771b0812470d8f..656807a8afa693e67a2277a0be749b212e1ec70b 100644 (file)
--- a/fs/btrfs/delalloc-space.h
+++ b/fs/btrfs/delalloc-space.h
@@ -10,7 +10,7 @@ int btrfs_check_data_free_space(struct inode *inode,
                        struct extent_changeset **reserved, u64 start, u64 len);
 void btrfs_free_reserved_data_space(struct btrfs_inode *inode,
                        struct extent_changeset *reserved, u64 start, u64 len);
-void btrfs_delalloc_release_space(struct inode *inode,
+void btrfs_delalloc_release_space(struct btrfs_inode *inode,
                                  struct extent_changeset *reserved,
                                  u64 start, u64 len, bool qgroup_free);
 void btrfs_free_reserved_data_space_noquota(struct btrfs_fs_info *fs_info,

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 96f2238a361b094c389f05207c84cdc6d73a658e..f6c5d94f30f96040b989997d2c54f9ad6acabeb2 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1784,7 +1784,7 @@ again:
                                __pos = round_down(pos,
                                                   fs_info->sectorsize) +
                                        (dirty_pages << PAGE_SHIFT);
-                               btrfs_delalloc_release_space(inode,
+                               btrfs_delalloc_release_space(BTRFS_I(inode),
                                                data_reserved, __pos,
                                                release_bytes, true);
                        }
@@ -1850,7 +1850,8 @@ again:
                        btrfs_delalloc_release_metadata(BTRFS_I(inode),
                                        release_bytes, true);
                } else {
-                       btrfs_delalloc_release_space(inode, data_reserved,
+                       btrfs_delalloc_release_space(BTRFS_I(inode),
+                                       data_reserved,
                                        round_down(pos, fs_info->sectorsize),
                                        release_bytes, true);
                }

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 59e04bec4b3519a7d64aa4cb3b6e01dd5f40b767..5a1dfbb457341527409daaec47ecb0501425203c 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2328,7 +2328,8 @@ again:
                if (!ret) {
                        btrfs_delalloc_release_extents(BTRFS_I(inode),
                                                       PAGE_SIZE);
-                       btrfs_delalloc_release_space(inode, data_reserved,
+                       btrfs_delalloc_release_space(BTRFS_I(inode),
+                                                    data_reserved,
                                                     page_start, PAGE_SIZE,
                                                     true);
                }
@@ -2378,8 +2379,8 @@ again:
 out_reserved:
        btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);
        if (free_delalloc_space)
-               btrfs_delalloc_release_space(inode, data_reserved, page_start,
-                                            PAGE_SIZE, true);
+               btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
+                                            page_start, PAGE_SIZE, true);
        unlock_extent_cached(&BTRFS_I(inode)->io_tree, page_start, page_end,
                             &cached_state);
 out_page:
@@ -4539,7 +4540,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,
 again:
        page = find_or_create_page(mapping, index, mask);
        if (!page) {
-               btrfs_delalloc_release_space(inode, data_reserved,
+               btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
                                             block_start, blocksize, true);
                btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize);
                ret = -ENOMEM;
@@ -4615,7 +4616,7 @@ out_unlock:
                        btrfs_delalloc_release_metadata(BTRFS_I(inode),
                                        blocksize, true);
                else
-                       btrfs_delalloc_release_space(inode, data_reserved,
+                       btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
                                        block_start, blocksize, true);
        }
        btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize);
@@ -7947,8 +7948,9 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
                current->journal_info = NULL;
                if (ret < 0 && ret != -EIOCBQUEUED) {
                        if (dio_data.reserve)
-                               btrfs_delalloc_release_space(inode, data_reserved,
-                                       offset, dio_data.reserve, true);
+                               btrfs_delalloc_release_space(BTRFS_I(inode),
+                                       data_reserved, offset, dio_data.reserve,
+                                       true);
                        /*
                         * On error we might have left some ordered extents
                         * without submitting corresponding bios for them, so
@@ -7963,7 +7965,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
                                        dio_data.unsubmitted_oe_range_start,
                                        false);
                } else if (ret >= 0 && (size_t)ret < count)
-                       btrfs_delalloc_release_space(inode, data_reserved,
+                       btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
                                        offset, count - (size_t)ret, true);
                btrfs_delalloc_release_extents(BTRFS_I(inode), count);
        }
@@ -8277,9 +8279,9 @@ again:
                                          fs_info->sectorsize);
                if (reserved_space < PAGE_SIZE) {
                        end = page_start + reserved_space - 1;
-                       btrfs_delalloc_release_space(inode, data_reserved,
-                                       page_start, PAGE_SIZE - reserved_space,
-                                       true);
+                       btrfs_delalloc_release_space(BTRFS_I(inode),
+                                       data_reserved, page_start,
+                                       PAGE_SIZE - reserved_space, true);
                }
        }
 
@@ -8334,7 +8336,7 @@ out_unlock:
        unlock_page(page);
 out:
        btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);
-       btrfs_delalloc_release_space(inode, data_reserved, page_start,
+       btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved, page_start,
                                     reserved_space, (ret != 0));
 out_noreserve:
        sb_end_pagefault(inode->i_sb);

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index b3e4c632d80c4d1e86e6c099de0e2a01b4745f11..90083fb049280d60fbefa66d4474922af6f1c5a0 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1333,7 +1333,7 @@ again:
                spin_lock(&BTRFS_I(inode)->lock);
                btrfs_mod_outstanding_extents(BTRFS_I(inode), 1);
                spin_unlock(&BTRFS_I(inode)->lock);
-               btrfs_delalloc_release_space(inode, data_reserved,
+               btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
                                start_index << PAGE_SHIFT,
                                (page_cnt - i_done) << PAGE_SHIFT, true);
        }
@@ -1361,7 +1361,7 @@ out:
                unlock_page(pages[i]);
                put_page(pages[i]);
        }
-       btrfs_delalloc_release_space(inode, data_reserved,
+       btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
                        start_index << PAGE_SHIFT,
                        page_cnt << PAGE_SHIFT, true);
        btrfs_delalloc_release_extents(BTRFS_I(inode), page_cnt << PAGE_SHIFT);

diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c
index fe3e05b5169113b02ec4e321cd65c307b5cf545c..9da0f101548fc422395c33e80b366698be13ba97 100644 (file)
--- a/fs/btrfs/reflink.c
+++ b/fs/btrfs/reflink.c
@@ -134,8 +134,8 @@ out_unlock:
                put_page(page);
        }
        if (ret)
-               btrfs_delalloc_release_space(inode, data_reserved, file_offset,
-                                            block_size, true);
+               btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
+                                            file_offset, block_size, true);
        btrfs_delalloc_release_extents(BTRFS_I(inode), block_size);
 out:
        extent_changeset_free(data_reserved);