diff options
| author | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /fs/open.c | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
| parent | c151694b2c48d956ac8c8c59c6927f89cc29ef70 (diff) | |
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
| @@ -701,7 +701,8 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, | |||
| 701 | if (error) | 701 | if (error) |
| 702 | goto cleanup_all; | 702 | goto cleanup_all; |
| 703 | } | 703 | } |
| 704 | ima_counts_get(f); | 704 | if ((f->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) |
| 705 | i_readcount_inc(inode); | ||
| 705 | 706 | ||
| 706 | f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC); | 707 | f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC); |
| 707 | 708 | ||