---

yaml --- r: 61660 b: refs/heads/master c: 5d3dbbe h: refs/heads/master v: v3
git-mirror · Jul 19, 2007 · bbcd98e · bbcd98e
1 parent df37a5f
commit bbcd98e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a25b96c1f6e1a3c85c9524f3046c7c75d8fecc7
+refs/heads/master: 5d3dbbeaf56d0365ac6b5c0a0da0bd31cc4781e1
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c
@@ -120,14 +120,14 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
 		mntput(mnt);
 		goto out;
 	}
-	if (exp2 && ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2))) {
+	if ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) {
 		/* successfully crossed mount point */
 		exp_put(exp);
 		*expp = exp2;
 		dput(dentry);
 		*dpp = mounts;
 	} else {
-		if (exp2) exp_put(exp2);
+		exp_put(exp2);
 		dput(mounts);
 	}
 	mntput(mnt);