diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-26 11:21:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-26 11:21:43 -0700 |
| commit | f315cf5e02d9910b7be893f5b5afdcc2e49d352d (patch) | |
| tree | 5ecd91fab3a4bf35a22700d2aa8ebc1edf3d6059 /fs | |
| parent | c271f5bc9a7a03fab037dbf5bdd5a730a6e26211 (diff) | |
| parent | e4daf1ffbe6cc3b12aab4d604e627829e93e9914 (diff) | |
| download | blackbird-op-linux-f315cf5e02d9910b7be893f5b5afdcc2e49d352d.tar.gz blackbird-op-linux-f315cf5e02d9910b7be893f5b5afdcc2e49d352d.zip | |
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/vfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 8ff6a0019b0b..c827acb0e943 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -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) |
