Merge commit 'v3.17' into next

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

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index f501a9b5c9df18f5ec7cc360d385aa0c9dfb8344..6ab077bb897e1ede9b791ffe0a23e07f12380634 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -708,7 +708,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;