Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 87369
b: refs/heads/master
c: b663c6f
h: refs/heads/master
i:
  87367: 5e9cc3e
v: v3
  • Loading branch information
J. Bruce Fields authored and Linus Torvalds committed Mar 14, 2008
1 parent 5267225 commit 9cba313
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b89ca7a3847c0d5b1e86e83f4860a866f28a89b
refs/heads/master: b663c6fd98c9cf586279db03cec3257c413efd00
4 changes: 2 additions & 2 deletions trunk/fs/nfsd/nfsfh.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
fhp->fh_dentry = dentry;
fhp->fh_export = exp;
nfsd_nr_verified++;
cache_get(&exp->h);
} else {
/*
* just rechecking permissions
Expand All @@ -241,6 +242,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
dprintk("nfsd: fh_verify - just checking\n");
dentry = fhp->fh_dentry;
exp = fhp->fh_export;
cache_get(&exp->h);
/*
* Set user creds for this exportpoint; necessary even
* in the "just checking" case because this may be a
Expand All @@ -252,8 +254,6 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
if (error)
goto out;
}
cache_get(&exp->h);


error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
if (error)
Expand Down

0 comments on commit 9cba313

Please sign in to comment.