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>

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index dc6e9a3..447d0ac 100644 (file)
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -148,8 +148,7 @@ int __init btrfs_prelim_ref_init(void)
 
 void btrfs_prelim_ref_exit(void)
 {
-       if (btrfs_prelim_ref_cache)
-               kmem_cache_destroy(btrfs_prelim_ref_cache);
+       kmem_cache_destroy(btrfs_prelim_ref_cache);
 }
 
 /*

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 0be47e4..716a4ec 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -43,8 +43,7 @@ int __init btrfs_delayed_inode_init(void)
 
 void btrfs_delayed_inode_exit(void)
 {
-       if (delayed_node_cache)
-               kmem_cache_destroy(delayed_node_cache);
+       kmem_cache_destroy(delayed_node_cache);
 }
 
 static inline void btrfs_init_delayed_node(

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 914ac13..430b368 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -929,14 +929,10 @@ btrfs_find_delayed_ref_head(struct btrfs_trans_handle *trans, u64 bytenr)
 
 void btrfs_delayed_ref_exit(void)
 {
-       if (btrfs_delayed_ref_head_cachep)
-               kmem_cache_destroy(btrfs_delayed_ref_head_cachep);
-       if (btrfs_delayed_tree_ref_cachep)
-               kmem_cache_destroy(btrfs_delayed_tree_ref_cachep);
-       if (btrfs_delayed_data_ref_cachep)
-               kmem_cache_destroy(btrfs_delayed_data_ref_cachep);
-       if (btrfs_delayed_extent_op_cachep)
-               kmem_cache_destroy(btrfs_delayed_extent_op_cachep);
+       kmem_cache_destroy(btrfs_delayed_ref_head_cachep);
+       kmem_cache_destroy(btrfs_delayed_tree_ref_cachep);
+       kmem_cache_destroy(btrfs_delayed_data_ref_cachep);
+       kmem_cache_destroy(btrfs_delayed_extent_op_cachep);
 }
 
 int btrfs_delayed_ref_init(void)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 4545e2e..19f8e5b 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -110,8 +110,7 @@ int __init btrfs_end_io_wq_init(void)
 
 void btrfs_end_io_wq_exit(void)
 {
-       if (btrfs_end_io_wq_cache)
-               kmem_cache_destroy(btrfs_end_io_wq_cache);
+       kmem_cache_destroy(btrfs_end_io_wq_cache);
 }
 
 /*

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index f3910ac..96d24d0 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -206,10 +206,8 @@ void extent_io_exit(void)
         * destroy caches.
         */
        rcu_barrier();
-       if (extent_state_cache)
-               kmem_cache_destroy(extent_state_cache);
-       if (extent_buffer_cache)
-               kmem_cache_destroy(extent_buffer_cache);
+       kmem_cache_destroy(extent_state_cache);
+       kmem_cache_destroy(extent_buffer_cache);
        if (btrfs_bioset)
                bioset_free(btrfs_bioset);
 }

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 84fb56d..cdbadea 100644 (file)
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -20,8 +20,7 @@ int __init extent_map_init(void)
 
 void extent_map_exit(void)
 {
-       if (extent_map_cache)
-               kmem_cache_destroy(extent_map_cache);
+       kmem_cache_destroy(extent_map_cache);
 }
 
 /**

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 610f569..b387fb5 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2939,8 +2939,7 @@ const struct file_operations btrfs_file_operations = {
 
 void btrfs_auto_defrag_exit(void)
 {
-       if (btrfs_inode_defrag_cachep)
-               kmem_cache_destroy(btrfs_inode_defrag_cachep);
+       kmem_cache_destroy(btrfs_inode_defrag_cachep);
 }
 
 int btrfs_auto_defrag_init(void)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index cf0b379..f067c77 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9178,16 +9178,11 @@ void btrfs_destroy_cachep(void)
         * destroy cache.
         */
        rcu_barrier();
-       if (btrfs_inode_cachep)
-               kmem_cache_destroy(btrfs_inode_cachep);
-       if (btrfs_trans_handle_cachep)
-               kmem_cache_destroy(btrfs_trans_handle_cachep);
-       if (btrfs_transaction_cachep)
-               kmem_cache_destroy(btrfs_transaction_cachep);
-       if (btrfs_path_cachep)
-               kmem_cache_destroy(btrfs_path_cachep);
-       if (btrfs_free_space_cachep)
-               kmem_cache_destroy(btrfs_free_space_cachep);
+       kmem_cache_destroy(btrfs_inode_cachep);
+       kmem_cache_destroy(btrfs_trans_handle_cachep);
+       kmem_cache_destroy(btrfs_transaction_cachep);
+       kmem_cache_destroy(btrfs_path_cachep);
+       kmem_cache_destroy(btrfs_free_space_cachep);
 }
 
 int btrfs_init_cachep(void)

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 8c27292..988eb15 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -1114,6 +1114,5 @@ int __init ordered_data_init(void)
 
 void ordered_data_exit(void)
 {
-       if (btrfs_ordered_extent_cache)
-               kmem_cache_destroy(btrfs_ordered_extent_cache);
+       kmem_cache_destroy(btrfs_ordered_extent_cache);
 }