diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /fs/nfsd/vfs.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index a0c2b253818b..7867151ebb83 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -115,7 +115,8 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, | |||
| 115 | 115 | ||
| 116 | exp2 = rqst_exp_get_by_name(rqstp, mnt, mounts); | 116 | exp2 = rqst_exp_get_by_name(rqstp, mnt, mounts); |
| 117 | if (IS_ERR(exp2)) { | 117 | if (IS_ERR(exp2)) { |
| 118 | err = PTR_ERR(exp2); | 118 | if (PTR_ERR(exp2) != -ENOENT) |
| 119 | err = PTR_ERR(exp2); | ||
| 119 | dput(mounts); | 120 | dput(mounts); |
| 120 | mntput(mnt); | 121 | mntput(mnt); |
| 121 | goto out; | 122 | goto out; |