From 7259a4ff7b55690bc788c21d6215cedac8340a9f6e1668ae66c1860ad2c21a4f Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 30 Apr 2015 11:26:11 +0000 Subject: [PATCH] - hv: hypervvssd: call endmntent before call setmntent again OBS-URL: https://build.opensuse.org/package/show/Virtualization/hyper-v?expand=0&rev=112 --- hyper-v.changes | 5 +++++ hyper-v.tools.hv.hv_vss_daemon.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hyper-v.changes b/hyper-v.changes index c614948..0f3a6dc 100644 --- a/hyper-v.changes +++ b/hyper-v.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 30 11:25:47 UTC 2015 - ohering@suse.de + +- hv: hypervvssd: call endmntent before call setmntent again + ------------------------------------------------------------------- Thu Apr 16 15:23:18 UTC 2015 - ohering@suse.de diff --git a/hyper-v.tools.hv.hv_vss_daemon.c b/hyper-v.tools.hv.hv_vss_daemon.c index e1567ae..e80b082 100644 --- a/hyper-v.tools.hv.hv_vss_daemon.c +++ b/hyper-v.tools.hv.hv_vss_daemon.c @@ -82,6 +82,7 @@ static int vss_operate(int operation) char match[] = "/dev/"; FILE *mounts; struct mntent *ent; + char errdir[1024] = {0}; unsigned int cmd; int error = 0, root_seen = 0, save_errno = 0; @@ -116,6 +117,8 @@ static int vss_operate(int operation) goto err; } + endmntent(mounts); + if (root_seen) { error |= vss_do_freeze("/", cmd); if (error && operation == VSS_OP_FREEZE) @@ -125,16 +128,19 @@ static int vss_operate(int operation) goto out; err: save_errno = errno; + if (ent) { + strncpy(errdir, ent->mnt_dir, sizeof(errdir)-1); + endmntent(mounts); + } vss_operate(VSS_OP_THAW); /* Call syslog after we thaw all filesystems */ if (ent) syslog(LOG_ERR, "FREEZE of %s failed; error:%d %s", - ent->mnt_dir, save_errno, strerror(save_errno)); + errdir, save_errno, strerror(save_errno)); else syslog(LOG_ERR, "FREEZE of / failed; error:%d %s", save_errno, strerror(save_errno)); out: - endmntent(mounts); return error; }