From 97461b9591875f9e85e41a21368a719ce3023b16 Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Tue, 2 Nov 2010 10:11:37 -0400
Subject: [PATCH] --- yaml --- r: 235089 b: refs/heads/master c:
 a5c96ebf1d71df0c5fb77ab58c9aeb307cf02372 h: refs/heads/master i:   235087:
 44d1d829fbd72c3f20174751664a0c10e75118fc v: v3

---
 [refs]                   |  2 +-
 trunk/include/linux/fs.h | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f8752032781d..c9c6979f558b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a68a27b6f2354273bacc39c3dd06456edb202230
+refs/heads/master: a5c96ebf1d71df0c5fb77ab58c9aeb307cf02372
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index ef85322863b9..a3e8f02b727d 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -2186,6 +2186,26 @@ static inline void allow_write_access(struct file *file)
 	if (file)
 		atomic_inc(&file->f_path.dentry->d_inode->i_writecount);
 }
+#ifdef CONFIG_IMA
+static inline void i_readcount_dec(struct inode *inode)
+{
+	BUG_ON(!atomic_read(&inode->i_readcount));
+	atomic_dec(&inode->i_readcount);
+}
+static inline void i_readcount_inc(struct inode *inode)
+{
+	atomic_inc(&inode->i_readcount);
+}
+#else
+static inline void i_readcount_dec(struct inode *inode)
+{
+	return;
+}
+static inline void i_readcount_inc(struct inode *inode)
+{
+	return;
+}
+#endif
 extern int do_pipe_flags(int *, int);
 extern struct file *create_read_pipe(struct file *f, int flags);
 extern struct file *create_write_pipe(int flags);