Merge branch 'master'; commit 'v2.6.38-rc7' into next

[firefly-linux-kernel-4.4.55.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index 5a2c6ebc22b5d9a1e355050cb14d3218f7a9d0d3..49b91ed9588d47c17f3b73c60072cd0ea32ad674 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -693,7 +693,8 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,
                if (error)
                        goto cleanup_all;
        }
-       ima_counts_get(f);
+       if ((f->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
+               i_readcount_inc(inode);
 
        f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);