No FreeWriterMetadata() after GatherWriterMetadata() in requester.cpp
PATCH 1/1 No FreeWriterMetadata() after GatherWriterMetadata() in requester.cpp
FreeWriterMetadata() should be called if GatherWriterMetadata() succeeded.
qga/vss-win32/requester.cpp +11 -0
@@ -47,6 +47,7 @@ static struct QGAVSSContext { HANDLE hEventFrozen; /* notify fs/writer freeze from provider */ HANDLE hEventThaw; /* request provider to thaw */ HANDLE hEventTimeout; /* notify timeout in provider */ + BOOL bWriterMetadataGathered; /* TRUE if GatherWriterMetadata succeed */ int cFrozenVols; /* number of frozen volumes */ } vss_ctx;
@@ -92,6 +93,8 @@ STDAPI requester_init(void) static void requester_cleanup(void) { + HRESULT hr = S_OK; + if (vss_ctx.hEventFrozen) { CloseHandle(vss_ctx.hEventFrozen); vss_ctx.hEventFrozen = NULL;
@@ -108,6 +111,12 @@ static void requester_cleanup(void) vss_ctx.pAsyncSnapshot->Release(); vss_ctx.pAsyncSnapshot = NULL; } + if (vss_ctx.bWriterMetadataGathered) { + hr = vss_ctx.pVssbc->FreeWriterMetadata(); + if (FAILED(hr)) { + err_set(errset, hr, "failed to free writer metadata"); + } + } if (vss_ctx.pVssbc) { vss_ctx.pVssbc->Release(); vss_ctx.pVssbc = NULL;
@@ -323,8 +332,10 @@ void requester_freeze(int *num_vols, ErrorSet *errset) } if (FAILED(hr)) { err_set(errset, hr, "failed to gather writer metadata"); + vss_ctx.bWriterMetadataGathered = FALSE; goto out; } + vss_ctx.bWriterMetadataGathered = TRUE; AddComponents(errset); if (err_is_set(errset)) {
Correct patch format.
Signed-off-by Guangmu Zhu <[email protected]>
--- qga/vss-win32/requester.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+)
qga/vss-win32/requester.cpp +11 -0
@@ -47,6 +47,7 @@ static struct QGAVSSContext { HANDLE hEventFrozen; /* notify fs/writer freeze from provider */ HANDLE hEventThaw; /* request provider to thaw */ HANDLE hEventTimeout; /* notify timeout in provider */ + BOOL bWriterMetadataGathered; /* TRUE if GatherWriterMetadata succeed */ int cFrozenVols; /* number of frozen volumes */ } vss_ctx;
@@ -92,6 +93,8 @@ STDAPI requester_init(void) static void requester_cleanup(void) { + HRESULT hr = S_OK; + if (vss_ctx.hEventFrozen) { CloseHandle(vss_ctx.hEventFrozen); vss_ctx.hEventFrozen = NULL;
@@ -108,6 +111,12 @@ static void requester_cleanup(void) vss_ctx.pAsyncSnapshot->Release(); vss_ctx.pAsyncSnapshot = NULL; } + if (vss_ctx.bWriterMetadataGathered) { + hr = vss_ctx.pVssbc->FreeWriterMetadata(); + if (FAILED(hr)) { + err_set(errset, hr, "failed to free writer metadata"); + } + } if (vss_ctx.pVssbc) { vss_ctx.pVssbc->Release(); vss_ctx.pVssbc = NULL;
@@ -323,8 +332,10 @@ void requester_freeze(int *num_vols, ErrorSet *errset) } if (FAILED(hr)) { err_set(errset, hr, "failed to gather writer metadata"); + vss_ctx.bWriterMetadataGathered = FALSE; goto out; } + vss_ctx.bWriterMetadataGathered = TRUE; AddComponents(errset); if (err_is_set(errset)) {
Signature · 8 lines
2.1.4 ------------------------------------ FreeWriterMetadata() should be called if GatherWriterMetadata() succeeded.
qga/vss-win32/requester.cpp +11 -0
@@ -47,6 +47,7 @@ static struct QGAVSSContext { HANDLE hEventFrozen; /* notify fs/writer freeze from provider */ HANDLE hEventThaw; /* request provider to thaw */ HANDLE hEventTimeout; /* notify timeout in provider */ + BOOL bWriterMetadataGathered; /* TRUE if GatherWriterMetadata succeed */ int cFrozenVols; /* number of frozen volumes */ } vss_ctx;
@@ -92,6 +93,8 @@ STDAPI requester_init(void) static void requester_cleanup(void) { + HRESULT hr = S_OK; + if (vss_ctx.hEventFrozen) { CloseHandle(vss_ctx.hEventFrozen); vss_ctx.hEventFrozen = NULL;
@@ -108,6 +111,12 @@ static void requester_cleanup(void) vss_ctx.pAsyncSnapshot->Release(); vss_ctx.pAsyncSnapshot = NULL; } + if (vss_ctx.bWriterMetadataGathered) { + hr = vss_ctx.pVssbc->FreeWriterMetadata(); + if (FAILED(hr)) { + err_set(errset, hr, "failed to free writer metadata"); + } + } if (vss_ctx.pVssbc) { vss_ctx.pVssbc->Release(); vss_ctx.pVssbc = NULL;
@@ -323,8 +332,10 @@ void requester_freeze(int *num_vols, ErrorSet *errset) } if (FAILED(hr)) { err_set(errset, hr, "failed to gather writer metadata"); + vss_ctx.bWriterMetadataGathered = FALSE; goto out; } + vss_ctx.bWriterMetadataGathered = TRUE; AddComponents(errset); if (err_is_set(errset)) {
I sent the patch some days ago and received no response. I have no idea if this means the patch is not Ok or just no one had interest in it...
Sincerely.
Guangmu Zhu
--------------------------------------
FreeWriterMetadata() should be called if GatherWriterMetadata() succeeded.
Signed-off-by Guangmu Zhu <[email protected]>
--- qga/vss-win32/requester.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+)
qga/vss-win32/requester.cpp +11 -0
@@ -47,6 +47,7 @@ static struct QGAVSSContext { HANDLE hEventFrozen; /* notify fs/writer freeze from provider */ HANDLE hEventThaw; /* request provider to thaw */ HANDLE hEventTimeout; /* notify timeout in provider */ + BOOL bWriterMetadataGathered; /* TRUE if GatherWriterMetadata succeed */ int cFrozenVols; /* number of frozen volumes */ } vss_ctx;
@@ -92,6 +93,8 @@ STDAPI requester_init(void) static void requester_cleanup(void) { + HRESULT hr = S_OK; + if (vss_ctx.hEventFrozen) { CloseHandle(vss_ctx.hEventFrozen); vss_ctx.hEventFrozen = NULL;
@@ -108,6 +111,12 @@ static void requester_cleanup(void) vss_ctx.pAsyncSnapshot->Release(); vss_ctx.pAsyncSnapshot = NULL; } + if (vss_ctx.bWriterMetadataGathered) { + hr = vss_ctx.pVssbc->FreeWriterMetadata(); + if (FAILED(hr)) { + err_set(errset, hr, "failed to free writer metadata"); + } + } if (vss_ctx.pVssbc) { vss_ctx.pVssbc->Release(); vss_ctx.pVssbc = NULL;
@@ -323,8 +332,10 @@ void requester_freeze(int *num_vols, ErrorSet *errset) } if (FAILED(hr)) { err_set(errset, hr, "failed to gather writer metadata"); + vss_ctx.bWriterMetadataGathered = FALSE; goto out; } + vss_ctx.bWriterMetadataGathered = TRUE; AddComponents(errset); if (err_is_set(errset)) {
Signature · 1 line
2.1.4