3 files changed, 3 insertions, 14 deletions

diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 7557791e954d..3d701084eac6 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -108,7 +108,6 @@ struct ima_iint_cache {
         struct mutex mutex;     /* protects: version, flags, digest */
         long readcount;         /* measured files readcount */
         long writecount;        /* measured files writecount */
-        long opencount;         /* opens reference count */
         struct kref refcount;   /* ima_iint_cache reference count */
 };
 
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c
index 8395f0f5e9b9..8e64313ed182 100644
--- a/security/integrity/ima/ima_iint.c
+++ b/security/integrity/ima/ima_iint.c
@@ -134,11 +134,6 @@ void iint_free(struct kref *kref)
                        iint->writecount);
                 iint->writecount = 0;
         }
-        if (iint->opencount != 0) {
-                printk(KERN_INFO "%s: opencount: %ld\n", __func__,
-                       iint->opencount);
-                iint->opencount = 0;
-        }
         kref_init(&iint->refcount);
         kmem_cache_free(iint_cache, iint);
 }
@@ -172,7 +167,6 @@ static void init_once(void *foo)
         mutex_init(&iint->mutex);
         iint->readcount = 0;
         iint->writecount = 0;
-        iint->opencount = 0;
         kref_init(&iint->refcount);
 }
 
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index e662b89d4079..995bd1b98fa8 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -122,7 +122,6 @@ static void ima_inc_counts(struct ima_iint_cache *iint, fmode_t mode)
 {
         BUG_ON(!mutex_is_locked(&iint->mutex));
 
-        iint->opencount++;
         if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
                 iint->readcount++;
         if (mode & FMODE_WRITE)
@@ -181,7 +180,6 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct inode *inode,
         mode_t mode = file->f_mode;
         BUG_ON(!mutex_is_locked(&iint->mutex));
 
-        iint->opencount--;
         if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
                 iint->readcount--;
         if (mode & FMODE_WRITE) {
@@ -192,13 +190,11 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct inode *inode,
                 }
         }
 
-        if (((iint->opencount < 0) ||
-             (iint->readcount < 0) ||
+        if (((iint->readcount < 0) ||
              (iint->writecount < 0)) &&
             !ima_limit_imbalance(file)) {
-                printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n",
-                       __func__, iint->readcount, iint->writecount,
-                       iint->opencount);
+                printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld)\n",
+                       __func__, iint->readcount, iint->writecount);
                 dump_stack();
         }
 }