Skip to content

Commit d70d692

Browse files
author
Octavian Purdila
committed
Merge pull request torvalds#119 from ngkaho1234/fix-fuse-call-seq
lklfuse: fix fuse routines calling sequence.
2 parents ba2e263 + 4db2ab5 commit d70d692

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

tools/lkl/lklfuse.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,8 @@ int main(int argc, char **argv)
605605
goto out_fuse_unmount;
606606
}
607607

608+
fuse_opt_free_args(&args);
609+
608610
if (fuse_daemonize(fg) ||
609611
fuse_set_signal_handlers(fuse_get_session(fuse))) {
610612
ret = -1;
@@ -627,11 +629,13 @@ int main(int argc, char **argv)
627629
out_remove_signals:
628630
fuse_remove_signal_handlers(fuse_get_session(fuse));
629631

630-
out_fuse_destroy:
631-
fuse_destroy(fuse);
632-
633632
out_fuse_unmount:
634-
fuse_unmount(mnt, ch);
633+
if (ch)
634+
fuse_unmount(mnt, ch);
635+
636+
out_fuse_destroy:
637+
if (fuse)
638+
fuse_destroy(fuse);
635639

636640
out_close_disk:
637641
close(lklfuse.disk.fd);

0 commit comments

Comments
 (0)