diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-07-19 04:49:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:04:52 -0400 |
commit | 5d3dbbeaf56d0365ac6b5c0a0da0bd31cc4781e1 (patch) | |
tree | aa47031138ddb94f8a725ab525a46bffd466a479 /fs | |
parent | 9a25b96c1f6e1a3c85c9524f3046c7c75d8fecc7 (diff) |
nfsd: remove unnecessary NULL checks from nfsd_cross_mnt
We can now assume that rqst_exp_get_by_name() does not return NULL; so clean
up some unnecessary checks.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index b8da5ddb3a0..5c97d0ea9e2 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -120,14 +120,14 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, | |||
120 | mntput(mnt); | 120 | mntput(mnt); |
121 | goto out; | 121 | goto out; |
122 | } | 122 | } |
123 | if (exp2 && ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2))) { | 123 | if ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) { |
124 | /* successfully crossed mount point */ | 124 | /* successfully crossed mount point */ |
125 | exp_put(exp); | 125 | exp_put(exp); |
126 | *expp = exp2; | 126 | *expp = exp2; |
127 | dput(dentry); | 127 | dput(dentry); |
128 | *dpp = mounts; | 128 | *dpp = mounts; |
129 | } else { | 129 | } else { |
130 | if (exp2) exp_put(exp2); | 130 | exp_put(exp2); |
131 | dput(mounts); | 131 | dput(mounts); |
132 | } | 132 | } |
133 | mntput(mnt); | 133 | mntput(mnt); |