diff options
| author |   James Morris <james.l.morris@oracle.com> | 2012-05-22 11:21:06 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-22 11:21:06 +1000 |
| commit | ff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch) | |
| tree | 9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /fs | |
| parent | apparmor: fix long path failure due to disconnected path (diff) | |
| parent | SELinux: remove unused common_audit_data in flush_unauthorized_files (diff) | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Per pull request, for 3.5.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c index 5720854156db..5eccdcea2d1b 100644 --- a/fs/open.c +++ b/fs/open.c @@ -681,7 +681,7 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, f->f_op = fops_get(inode->i_fop); - error = security_dentry_open(f, cred); + error = security_file_open(f, cred); if (error) goto cleanup_all; |