libmount: improve mnt_reset_fs()

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/src/fs.c b/libmount/src/fs.c
index fe3260bb344c43dc5787421be51048b09d82987c..2cd01a9f5f50f686d68e211b7744053a808758ea 100644 (file)
--- a/libmount/src/fs.c
+++ b/libmount/src/fs.c
@@ -51,25 +51,10 @@ void mnt_free_fs(struct libmnt_fs *fs)
 {
        if (!fs)
                return;
-       list_del(&fs->ents);
-       DBG(FS, ul_debugobj(fs, "free [refcount=%d]", fs->refcount));
 
-       free(fs->source);
-       free(fs->bindsrc);
-       free(fs->tagname);
-       free(fs->tagval);
-       free(fs->root);
-       free(fs->swaptype);
-       free(fs->target);
-       free(fs->fstype);
-       free(fs->optstr);
-       free(fs->vfs_optstr);
-       free(fs->fs_optstr);
-       free(fs->user_optstr);
-       free(fs->attrs);
-       free(fs->opt_fields);
-       free(fs->comment);
+       DBG(FS, ul_debugobj(fs, "free [refcount=%d]", fs->refcount));
 
+       mnt_reset_fs(fs);
        free(fs);
 }
 
@@ -87,6 +72,24 @@ void mnt_reset_fs(struct libmnt_fs *fs)
                return;
 
        ref = fs->refcount;
+
+       list_del(&fs->ents);
+       free(fs->source);
+       free(fs->bindsrc);
+       free(fs->tagname);
+       free(fs->tagval);
+       free(fs->root);
+       free(fs->swaptype);
+       free(fs->target);
+       free(fs->fstype);
+       free(fs->optstr);
+       free(fs->vfs_optstr);
+       free(fs->fs_optstr);
+       free(fs->user_optstr);
+       free(fs->attrs);
+       free(fs->opt_fields);
+       free(fs->comment);
+
        memset(fs, 0, sizeof(*fs));
        INIT_LIST_HEAD(&fs->ents);
        fs->refcount = ref;