sfree(NULL) is ok

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/filesetup.c b/filesetup.c
index c188981356a2cb022e9037d84c8f6f01d9c33a6c..32b8b2e4d47ad4bae1e51e3c8958f4041511c12b 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -746,11 +746,8 @@ void close_and_free_files(struct thread_data *td)
 
                sfree(f->file_name);
                f->file_name = NULL;
 
                sfree(f->file_name);
                f->file_name = NULL;

-
-               if (f->file_map) {
-                       sfree(f->file_map);
-                       f->file_map = NULL;
-               }
+               sfree(f->file_map);
+               f->file_map = NULL;

                sfree(f);
        }
 
                sfree(f);
        }
 

diff --git a/fio.c b/fio.c
index 03dc6cc8871319b786a66d854371320be4208728..ae62d23329839c1c9bc28c5f57a6a826cb42c6f1 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -1694,8 +1694,7 @@ int main(int argc, char *argv[])
 
        cgroup_kill(cgroup_list);
        sfree(cgroup_list);
 
        cgroup_kill(cgroup_list);
        sfree(cgroup_list);

-       if (cgroup_mnt)
-               sfree(cgroup_mnt);
+       sfree(cgroup_mnt);

 
        fio_mutex_remove(startup_mutex);
        fio_mutex_remove(writeout_mutex);
 
        fio_mutex_remove(startup_mutex);
        fio_mutex_remove(writeout_mutex);