aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Moise <00moses.alexander00@gmail.com>2015-10-25 16:15:06 -0400
committerDavid Sterba <dsterba@suse.com>2016-01-07 08:30:17 -0500
commit352dd9c8d3b34e406584c95be45cbc4f1ec5a405 (patch)
tree223299069a55410bd104a6ebebd34502887273e8
parent575a75d6fabf6e1217204deca79aea26d6670a12 (diff)
btrfs: zero out delayed node upon allocation
It's slightly cleaner to zero-out the delayed node upon allocation than to do it by hand in btrfs_init_delayed_node() for a few members Signed-off-by: Alexandru Moise <00moses.alexander00@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/delayed-inode.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index e0941fbb913c..0be47e4b8136 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -54,16 +54,11 @@ static inline void btrfs_init_delayed_node(
54 delayed_node->root = root; 54 delayed_node->root = root;
55 delayed_node->inode_id = inode_id; 55 delayed_node->inode_id = inode_id;
56 atomic_set(&delayed_node->refs, 0); 56 atomic_set(&delayed_node->refs, 0);
57 delayed_node->count = 0;
58 delayed_node->flags = 0;
59 delayed_node->ins_root = RB_ROOT; 57 delayed_node->ins_root = RB_ROOT;
60 delayed_node->del_root = RB_ROOT; 58 delayed_node->del_root = RB_ROOT;
61 mutex_init(&delayed_node->mutex); 59 mutex_init(&delayed_node->mutex);
62 delayed_node->index_cnt = 0;
63 INIT_LIST_HEAD(&delayed_node->n_list); 60 INIT_LIST_HEAD(&delayed_node->n_list);
64 INIT_LIST_HEAD(&delayed_node->p_list); 61 INIT_LIST_HEAD(&delayed_node->p_list);
65 delayed_node->bytes_reserved = 0;
66 memset(&delayed_node->inode_item, 0, sizeof(delayed_node->inode_item));
67} 62}
68 63
69static inline int btrfs_is_continuous_delayed_item( 64static inline int btrfs_is_continuous_delayed_item(
@@ -132,7 +127,7 @@ again:
132 if (node) 127 if (node)
133 return node; 128 return node;
134 129
135 node = kmem_cache_alloc(delayed_node_cache, GFP_NOFS); 130 node = kmem_cache_zalloc(delayed_node_cache, GFP_NOFS);
136 if (!node) 131 if (!node)
137 return ERR_PTR(-ENOMEM); 132 return ERR_PTR(-ENOMEM);
138 btrfs_init_delayed_node(node, root, ino); 133 btrfs_init_delayed_node(node, root, ino);