btrfs: pass the ino via truncate control

In the future we are going to want to truncate inode items without
needing to have an btrfs_inode to pass in, so add ino to the
btrfs_truncate_control and use that to look up the inode items to
truncate.

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 3a6bf361409be9790f4b0bbf2a06370c6bd63a2a..c2a34179bddc5e63bc8675780a6e57b440ba219d 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -293,6 +293,7 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans,
 {
        struct btrfs_truncate_control control = {
                .new_size = 0,
+               .ino = btrfs_ino(BTRFS_I(vfs_inode)),
                .min_type = BTRFS_EXTENT_DATA_KEY,
                .clear_extent_range = true,
        };

diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c
index 5598090bd0aa7af590634e1a9aca19eba69bd500..a24ed49daa4eda6ee5d78d64468b0ce90acfcf5c 100644 (file)
--- a/fs/btrfs/inode-item.c
+++ b/fs/btrfs/inode-item.c
@@ -458,7 +458,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
        int pending_del_slot = 0;
        int extent_type = -1;
        int ret;
-       u64 ino = btrfs_ino(inode);
        u64 bytes_deleted = 0;
        bool be_nice = false;
        bool should_throttle = false;
@@ -480,7 +479,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
                return -ENOMEM;
        path->reada = READA_BACK;
 
-       key.objectid = ino;
+       key.objectid = control->ino;
        key.offset = (u64)-1;
        key.type = (u8)-1;
 
@@ -516,7 +515,7 @@ search_again:
                btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
                found_type = found_key.type;
 
-               if (found_key.objectid != ino)
+               if (found_key.objectid != control->ino)
                        break;
 
                if (found_type < control->min_type)
@@ -667,7 +666,7 @@ delete:
                        btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF,
                                        extent_start, extent_num_bytes, 0);
                        btrfs_init_data_ref(&ref, btrfs_header_owner(leaf),
-                                       ino, extent_offset,
+                                       control->ino, extent_offset,
                                        root->root_key.objectid, false);
                        ret = btrfs_free_extent(trans, &ref);
                        if (ret) {

diff --git a/fs/btrfs/inode-item.h b/fs/btrfs/inode-item.h
index 5817ba4ddd239ca20b89ff774afc26cb91d46384..b0dc14efde30accf1672c7a84e375bd6fdb875f7 100644 (file)
--- a/fs/btrfs/inode-item.h
+++ b/fs/btrfs/inode-item.h
@@ -32,6 +32,9 @@ struct btrfs_truncate_control {
        /* OUT: the number of bytes to sub from this inode. */
        u64 sub_bytes;
 
+       /* IN: the ino we are truncating. */
+       u64 ino;
+
        /*
         * IN: minimum key type to remove.  All key types with this type are
         * removed only if their offset >= new_size.

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 1a3f40be4ed8c2d3d07c4ed7a96a4fb3ca503075..ea1223c53a102492c3ad9340ad4582dab1c22a49 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5252,6 +5252,7 @@ void btrfs_evict_inode(struct inode *inode)
 
        while (1) {
                struct btrfs_truncate_control control = {
+                       .ino = btrfs_ino(BTRFS_I(inode)),
                        .new_size = 0,
                        .min_type = 0,
                };
@@ -8533,6 +8534,7 @@ out_noreserve:
 static int btrfs_truncate(struct inode *inode, bool skip_writeback)
 {
        struct btrfs_truncate_control control = {
+               .ino = btrfs_ino(BTRFS_I(inode)),
                .min_type = BTRFS_EXTENT_DATA_KEY,
                .clear_extent_range = true,
        };

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 2b5e24c24a6b32daa8febeef69677f8eb113be5a..8c099cd409568f752a031ed1cb7b975509b7e8f4 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -4100,6 +4100,7 @@ static int truncate_inode_items(struct btrfs_trans_handle *trans,
 {
        struct btrfs_truncate_control control = {
                .new_size = new_size,
+               .ino = btrfs_ino(inode),
                .min_type = min_type,
                .skip_ref_updates = true,
        };