From c1a6e67183e13ad870d12b0a052ef2dcb00bfa1d Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Tue, 25 Aug 2020 13:02:22 -0400
Subject: [PATCH] Revert "HACK: Manually include c/storage #698"

This reverts commit ae2ee65eff71c5780e4484f1316dbbdd87bf1760.
This was a horrible hack that we did for time reasons, to get
2.0.5 out on schedule; now that it has been merged into c/storage
properly we no longer need or want it.

Signed-off-by: Matthew Heon <mheon@redhat.com>
---
 .cirrus.yml                                   | 50 +++++++++++--------
 .../containers/storage/drivers/counter.go     |  4 --
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 06ebb0c96caf..87c135b7884c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -204,34 +204,34 @@ rpmbuild_task:
 # whether the git tree is clean.  The reasoning for that is to make sure
 # that the vendor.conf, the code and the vendored packages in ./vendor are
 # in sync at all times.
-# vendor_task:
+vendor_task:
 
-#     only_if: >-
-#         $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-#         $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
+    only_if: >-
+        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
+        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
 
-#     depends_on:
-#         - "gating"
+    depends_on:
+        - "gating"
 
-#     env:
-#         CIRRUS_WORKING_DIR: "/var/tmp/go/src/github.com/containers/libpod"
-#         GOPATH: "/var/tmp/go"
-#         GOSRC: "$CIRRUS_WORKING_DIR"
+    env:
+        CIRRUS_WORKING_DIR: "/var/tmp/go/src/github.com/containers/libpod"
+        GOPATH: "/var/tmp/go"
+        GOSRC: "$CIRRUS_WORKING_DIR"
 
-#     # Runs within Cirrus's "community cluster"
-#     container:
-#         image: docker.io/library/golang:1.13
-#         cpu: 4
-#         memory: 12
+    # Runs within Cirrus's "community cluster"
+    container:
+        image: docker.io/library/golang:1.13
+        cpu: 4
+        memory: 12
 
-#     timeout_in: 30m
+    timeout_in: 30m
 
-#     vendor_script:
-#         - 'cd ${CIRRUS_WORKING_DIR} && make vendor'
-#         - 'cd ${CIRRUS_WORKING_DIR} && ./hack/tree_status.sh'
+    vendor_script:
+        - 'cd ${CIRRUS_WORKING_DIR} && make vendor'
+        - 'cd ${CIRRUS_WORKING_DIR} && ./hack/tree_status.sh'
 
-#     on_failure:
-#         failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh |& ${TIMESTAMP}'
+    on_failure:
+        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh |& ${TIMESTAMP}'
 
 
 # This task runs `make varlink_api_generate` followed by ./hack/tree_status.sh to check
@@ -305,6 +305,7 @@ build_without_cgo_task:
 
     depends_on:
         - "gating"
+        - "vendor"
         - "varlink_api"
 
     only_if: >-
@@ -365,6 +366,7 @@ testing_task:
     alias: "testing"
     depends_on:
         - "gating"
+        - "vendor"
         - "varlink_api"
         - "build_without_cgo"
         - "container_image_build"
@@ -429,6 +431,7 @@ special_testing_rootless_task:
     depends_on:
         - "gating"
         - "varlink_api"
+        - "vendor"
         - "build_without_cgo"
 
     only_if: >-
@@ -463,6 +466,7 @@ special_testing_in_podman_task:
     depends_on:
         - "gating"
         - "varlink_api"
+        - "vendor"
         - "build_without_cgo"
 
     only_if: >-
@@ -501,6 +505,7 @@ special_testing_cross_task:
     depends_on:
         - "gating"
         - "varlink_api"
+        - "vendor"
 
     only_if: >-
         $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
@@ -538,6 +543,7 @@ special_testing_bindings_task:
     depends_on:
         - "gating"
         - "varlink_api"
+        - "vendor"
 
     only_if: >-
         $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
@@ -564,6 +570,7 @@ special_testing_endpoint_task:
     depends_on:
         - "gating"
         - "varlink_api"
+        - "vendor"
 
     only_if: >-
         $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
@@ -688,6 +695,7 @@ success_task:
     # ignores any dependent task conditions
     depends_on:
         - "gating"
+        - "vendor"
         - "varlink_api"
         - "build_without_cgo"
         - "container_image_build"
diff --git a/vendor/github.com/containers/storage/drivers/counter.go b/vendor/github.com/containers/storage/drivers/counter.go
index 3fc45495b2e6..72551a38d469 100644
--- a/vendor/github.com/containers/storage/drivers/counter.go
+++ b/vendor/github.com/containers/storage/drivers/counter.go
@@ -51,10 +51,6 @@ 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