c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't specifically open /etc/mtab - it is done in libzfs_init()

Browse Source 
a few lines further down and we can share the open file handle.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1498
This commit is contained in:
Turbo Fredriksson 2013-06-04 03:54:44 +02:00 committed by Brian Behlendorf
parent abbfdca483
commit 0bc7a7a754
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/zfs/zfs_main.c
View File

@ -66,6 +66,7 @@
#include "zfs_iter.h" #include "zfs_iter.h"
#include "zfs_util.h" #include "zfs_util.h"
#include "zfs_comutil.h" #include "zfs_comutil.h"
#include "libzfs_impl.h"
libzfs_handle_t *g_zfs; libzfs_handle_t *g_zfs;
@ -6343,12 +6344,6 @@ main(int argc, char **argv)
opterr = 0; 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. * Make sure the user has specified some command.
*/ */
@ -6387,6 +6382,8 @@ main(int argc, char **argv)
if ((g_zfs = libzfs_init()) == NULL) if ((g_zfs = libzfs_init()) == NULL)
return (1); return (1);
mnttab_file = g_zfs->libzfs_mnttab;
zpool_set_history_str("zfs", argc, argv, history_str); zpool_set_history_str("zfs", argc, argv, history_str);
verify(zpool_stage_history(g_zfs, history_str) == 0); verify(zpool_stage_history(g_zfs, history_str) == 0);
@ -6411,8 +6408,6 @@ main(int argc, char **argv)
} }
libzfs_fini(g_zfs); libzfs_fini(g_zfs);
(void) fclose(mnttab_file);
/* /*
* The 'ZFS_ABORT' environment variable causes us to dump core on exit * The 'ZFS_ABORT' environment variable causes us to dump core on exit
* for the purposes of running ::findleaks. * for the purposes of running ::findleaks.