tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

btrfs: drop null testing before destroy functions

Cleanup.

kmem_cache_destroy has support NULL argument checking,
so drop the double null testing before calling it.

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Kinglong Mee and committed by
David Sterba 5598e900 89771cc9

+17 -34
+1 -2
fs/btrfs/backref.c
··· 148 148 149 149 void btrfs_prelim_ref_exit(void) 150 150 { 151 - if (btrfs_prelim_ref_cache) 152 - kmem_cache_destroy(btrfs_prelim_ref_cache); 151 + kmem_cache_destroy(btrfs_prelim_ref_cache); 153 152 } 154 153 155 154 /*
+1 -2
fs/btrfs/delayed-inode.c
··· 43 43 44 44 void btrfs_delayed_inode_exit(void) 45 45 { 46 - if (delayed_node_cache) 47 - kmem_cache_destroy(delayed_node_cache); 46 + kmem_cache_destroy(delayed_node_cache); 48 47 } 49 48 50 49 static inline void btrfs_init_delayed_node(
+4 -8
fs/btrfs/delayed-ref.c
··· 929 929 930 930 void btrfs_delayed_ref_exit(void) 931 931 { 932 - if (btrfs_delayed_ref_head_cachep) 933 - kmem_cache_destroy(btrfs_delayed_ref_head_cachep); 934 - if (btrfs_delayed_tree_ref_cachep) 935 - kmem_cache_destroy(btrfs_delayed_tree_ref_cachep); 936 - if (btrfs_delayed_data_ref_cachep) 937 - kmem_cache_destroy(btrfs_delayed_data_ref_cachep); 938 - if (btrfs_delayed_extent_op_cachep) 939 - kmem_cache_destroy(btrfs_delayed_extent_op_cachep); 932 + kmem_cache_destroy(btrfs_delayed_ref_head_cachep); 933 + kmem_cache_destroy(btrfs_delayed_tree_ref_cachep); 934 + kmem_cache_destroy(btrfs_delayed_data_ref_cachep); 935 + kmem_cache_destroy(btrfs_delayed_extent_op_cachep); 940 936 } 941 937 942 938 int btrfs_delayed_ref_init(void)
+1 -2
fs/btrfs/disk-io.c
··· 110 110 111 111 void btrfs_end_io_wq_exit(void) 112 112 { 113 - if (btrfs_end_io_wq_cache) 114 - kmem_cache_destroy(btrfs_end_io_wq_cache); 113 + kmem_cache_destroy(btrfs_end_io_wq_cache); 115 114 } 116 115 117 116 /*
+2 -4
fs/btrfs/extent_io.c
··· 206 206 * destroy caches. 207 207 */ 208 208 rcu_barrier(); 209 - if (extent_state_cache) 210 - kmem_cache_destroy(extent_state_cache); 211 - if (extent_buffer_cache) 212 - kmem_cache_destroy(extent_buffer_cache); 209 + kmem_cache_destroy(extent_state_cache); 210 + kmem_cache_destroy(extent_buffer_cache); 213 211 if (btrfs_bioset) 214 212 bioset_free(btrfs_bioset); 215 213 }
+1 -2
fs/btrfs/extent_map.c
··· 20 20 21 21 void extent_map_exit(void) 22 22 { 23 - if (extent_map_cache) 24 - kmem_cache_destroy(extent_map_cache); 23 + kmem_cache_destroy(extent_map_cache); 25 24 } 26 25 27 26 /**
+1 -2
fs/btrfs/file.c
··· 2939 2939 2940 2940 void btrfs_auto_defrag_exit(void) 2941 2941 { 2942 - if (btrfs_inode_defrag_cachep) 2943 - kmem_cache_destroy(btrfs_inode_defrag_cachep); 2942 + kmem_cache_destroy(btrfs_inode_defrag_cachep); 2944 2943 } 2945 2944 2946 2945 int btrfs_auto_defrag_init(void)
+5 -10
fs/btrfs/inode.c
··· 9178 9178 * destroy cache. 9179 9179 */ 9180 9180 rcu_barrier(); 9181 - if (btrfs_inode_cachep) 9182 - kmem_cache_destroy(btrfs_inode_cachep); 9183 - if (btrfs_trans_handle_cachep) 9184 - kmem_cache_destroy(btrfs_trans_handle_cachep); 9185 - if (btrfs_transaction_cachep) 9186 - kmem_cache_destroy(btrfs_transaction_cachep); 9187 - if (btrfs_path_cachep) 9188 - kmem_cache_destroy(btrfs_path_cachep); 9189 - if (btrfs_free_space_cachep) 9190 - kmem_cache_destroy(btrfs_free_space_cachep); 9181 + kmem_cache_destroy(btrfs_inode_cachep); 9182 + kmem_cache_destroy(btrfs_trans_handle_cachep); 9183 + kmem_cache_destroy(btrfs_transaction_cachep); 9184 + kmem_cache_destroy(btrfs_path_cachep); 9185 + kmem_cache_destroy(btrfs_free_space_cachep); 9191 9186 } 9192 9187 9193 9188 int btrfs_init_cachep(void)
+1 -2
fs/btrfs/ordered-data.c
··· 1114 1114 1115 1115 void ordered_data_exit(void) 1116 1116 { 1117 - if (btrfs_ordered_extent_cache) 1118 - kmem_cache_destroy(btrfs_ordered_extent_cache); 1117 + kmem_cache_destroy(btrfs_ordered_extent_cache); 1119 1118 }