From ae2ee65eff71c5780e4484f1316dbbdd87bf1760 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 24 Aug 2020 15:10:53 -0400 Subject: HACK: Manually include c/storage #698 We need this release out by end of day, so we don't have time to do this right. Disable the vendor task and manually add c/storage PR #698 to the vendored copy of c/storage to make the tests pass. Once #698 merges into c/storage, we need to remove this commit and backport it to the v1.20 stable branch, then cut a release there. Signed-off-by: Matthew Heon --- vendor/github.com/containers/storage/drivers/counter.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vendor') diff --git a/vendor/github.com/containers/storage/drivers/counter.go b/vendor/github.com/containers/storage/drivers/counter.go index 72551a38d..3fc45495b 100644 --- a/vendor/github.com/containers/storage/drivers/counter.go +++ b/vendor/github.com/containers/storage/drivers/counter.go @@ -51,6 +51,10 @@ func (c *RefCounter) incdec(path string, infoOp func(minfo *minfo)) int { if c.checker.IsMounted(path) { m.count++ } + } else if !c.checker.IsMounted(path) { + // if the unmount was performed outside of this process (e.g. conmon cleanup) + //the ref counter would lose track of it. Check if it is still mounted. + m.count = 0 } infoOp(m) count := m.count -- cgit v1.2.3-54-g00ecf