diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-09-12 14:40:22 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-09-12 14:40:22 +0200 |
| commit | ac60ab4b4968b54fb5af20eac9dd78e36ad910c1 (patch) | |
| tree | a47e414fb34d91eb012b121d8138c6cee1fe065b /fs/nfsd/vfs.c | |
| parent | seccomp: Add reviewers to MAINTAINERS (diff) | |
| parent | integrity: make integrity files as 'integrity' module (diff) | |
| download | linux-ac60ab4b4968b54fb5af20eac9dd78e36ad910c1.tar.xz linux-ac60ab4b4968b54fb5af20eac9dd78e36ad910c1.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 140c496f612c..d49c778faecb 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -709,7 +709,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, host_err = PTR_ERR(*filp); *filp = NULL; } else { - host_err = ima_file_check(*filp, may_flags); + host_err = ima_file_check(*filp, may_flags, 0); if (may_flags & NFSD_MAY_64BIT_COOKIE) (*filp)->f_mode |= FMODE_64BITHASH; |