diff --git a/[refs] b/[refs] index cf6f0e424e75..eaaa31fd5c36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e70af56319e56423d6eb1ce25fc321cdf8cd41d +refs/heads/master: aeaa5ccd6421fbf9e7ded0ac67b12ea2b9fcf51e diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c index 97d79eff6b7f..8715d194561a 100644 --- a/trunk/fs/nfsd/vfs.c +++ b/trunk/fs/nfsd/vfs.c @@ -752,7 +752,8 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, flags, current_cred()); if (IS_ERR(*filp)) host_err = PTR_ERR(*filp); - host_err = ima_file_check(*filp, access); + else + host_err = ima_file_check(*filp, access); out_nfserr: err = nfserrno(host_err); out: