btrfs: assert that delayed item is a dir index item when adding it

All delayed items are for dir index items, we don't support any other item
types at the moment. So simplify __btrfs_add_delayed_item() and add an
assertion for checking the item's key type. This also allows the next
change to be simpler and avoid to check key types. In case we add support
for different item types in the future, then we'll hit the assertion
during development and be able to adjust any code that is assuming delayed
items are always associated to dir index items.

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

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index f5db8c5461592ee39a9d99231a7622836d9d404d..80679c33e400a3bbd326b7913279a7f08e00c1d3 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -438,10 +438,12 @@ static int __btrfs_add_delayed_item(struct btrfs_delayed_node *delayed_node,
        ins->delayed_node = delayed_node;
        ins->ins_or_del = action;
 
-       if (ins->key.type == BTRFS_DIR_INDEX_KEY &&
-           action == BTRFS_DELAYED_INSERTION_ITEM &&
+       /* Delayed items are always for dir index items. */
+       ASSERT(ins->key.type == BTRFS_DIR_INDEX_KEY);
+
+       if (action == BTRFS_DELAYED_INSERTION_ITEM &&
            ins->key.offset >= delayed_node->index_cnt)
-                       delayed_node->index_cnt = ins->key.offset + 1;
+               delayed_node->index_cnt = ins->key.offset + 1;
 
        delayed_node->count++;
        atomic_inc(&delayed_node->root->fs_info->delayed_root->items);