Skip to content

Commit

Permalink
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
torvalds committed Jul 26, 2013
2 parents c271f5b + e4daf1f commit f315cf5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions fs/nfsd/vfs.c
Expand Up @@ -830,9 +830,10 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
flags = O_WRONLY|O_LARGEFILE;
}
*filp = dentry_open(&path, flags, current_cred());
if (IS_ERR(*filp))
if (IS_ERR(*filp)) {
host_err = PTR_ERR(*filp);
else {
*filp = NULL;
} else {
host_err = ima_file_check(*filp, may_flags);

if (may_flags & NFSD_MAY_64BIT_COOKIE)
Expand Down

0 comments on commit f315cf5

Please sign in to comment.