diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-24 18:35:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 18:35:59 -0400 |
| commit | 024f47068a894907ee47b1b90c86090a00586940 (patch) | |
| tree | 4528b3566c3162ca2892b8c3d752d3957161e3d5 /vendor | |
| parent | c78c6b44ce63430218e141415a10b2010d42f883 (diff) | |
| parent | 13d5b2d661478005a0b7eec5563d13580b6cd3f8 (diff) | |
| download | podman-024f47068a894907ee47b1b90c86090a00586940.tar.gz podman-024f47068a894907ee47b1b90c86090a00586940.tar.bz2 podman-024f47068a894907ee47b1b90c86090a00586940.zip | |
Merge pull request #7402 from mheon/last_pr_before_205_really_this_time
Final v2.0.5 backports
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/storage/drivers/counter.go | 4 |
1 files changed, 4 insertions, 0 deletions
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 |