Skip to content

Commit

Permalink
Don't specifically open /etc/mtab - it is done in libzfs_init()
Browse files Browse the repository at this point in the history
a few lines further down and we can share the open file handle.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1498
  • Loading branch information
FransUrbo authored and behlendorf committed Aug 15, 2013
1 parent abbfdca commit 0bc7a7a
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions cmd/zfs/zfs_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#include "zfs_iter.h"
#include "zfs_util.h"
#include "zfs_comutil.h"
#include "libzfs_impl.h"

libzfs_handle_t *g_zfs;

Expand Down Expand Up @@ -6343,12 +6344,6 @@ main(int argc, char **argv)

opterr = 0;

if ((mnttab_file = fopen(MNTTAB, "r")) == NULL) {
(void) fprintf(stderr, gettext("internal error: unable to "
"open %s\n"), MNTTAB);
return (1);
}

/*
* Make sure the user has specified some command.
*/
Expand Down Expand Up @@ -6387,6 +6382,8 @@ main(int argc, char **argv)
if ((g_zfs = libzfs_init()) == NULL)
return (1);

mnttab_file = g_zfs->libzfs_mnttab;

zpool_set_history_str("zfs", argc, argv, history_str);
verify(zpool_stage_history(g_zfs, history_str) == 0);

Expand All @@ -6411,8 +6408,6 @@ main(int argc, char **argv)
}
libzfs_fini(g_zfs);

(void) fclose(mnttab_file);

/*
* The 'ZFS_ABORT' environment variable causes us to dump core on exit
* for the purposes of running ::findleaks.
Expand Down

0 comments on commit 0bc7a7a

Please sign in to comment.