diff options
| author | James Morris <jmorris@namei.org> | 2011-03-16 09:41:17 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-16 09:41:17 +1100 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /fs/open.c | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
| parent | c151694b2c48d956ac8c8c59c6927f89cc29ef70 (diff) | |
| download | linux-stable-a002951c97ff8da49938c982a4c236bf2fafdc9f.tar.gz linux-stable-a002951c97ff8da49938c982a4c236bf2fafdc9f.tar.bz2 linux-stable-a002951c97ff8da49938c982a4c236bf2fafdc9f.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c index b47aab39c057..80d430ae3b2d 100644 --- a/fs/open.c +++ b/fs/open.c @@ -701,7 +701,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); |