FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-13 08:06:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

Browse Source 
Pull nfsd fix from Bruce Fields:
 "One more nfsd bugfix for 3.11"

* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
  nfsd: nfsd_open: when dentry_open returns an error do not propagate as struct file
This commit is contained in:
Linus Torvalds 2013-07-26 11:21:43 -07:00
commit f315cf5e02
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfsd/vfs.c
View File

@ -830,9 +830,10 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
flags = O_WRONLY|O_LARGEFILE; flags = O_WRONLY|O_LARGEFILE;
} }
*filp = dentry_open(&path, flags, current_cred()); *filp = dentry_open(&path, flags, current_cred());
if (IS_ERR(*filp)) if (IS_ERR(*filp)) {
host_err = PTR_ERR(*filp); host_err = PTR_ERR(*filp);
else { *filp = NULL;
} else {
host_err = ima_file_check(*filp, may_flags); host_err = ima_file_check(*filp, may_flags);
if (may_flags & NFSD_MAY_64BIT_COOKIE) if (may_flags & NFSD_MAY_64BIT_COOKIE)