From 457f6f11c52aec149b1c1e0262ca402bc51c0fc1 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Thu, 22 Apr 2010 11:30:59 +0200
Subject: [PATCH] --- yaml --- r: 192367 b: refs/heads/master c:
 d03859a4aca3969efd91dc77be7efa2ae45b05d8 h: refs/heads/master i:   192365:
 d3f73d94d0a6c0614f78a321995e1c6db3ceefee   192363:
 027e0aa1dfdefc2b46fb3972e0bef37362bdff2d   192359:
 9cab0b360f26c9fc1fd70907d1c25ccb8bbc418b   192351:
 d85f424d81e3fc40765e530259bba2cfb0457b3c v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfsd/export.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2ff9ad1bbf5b..de828286339a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5771635592267758e7dc5647f2a0088aa6244159
+refs/heads/master: d03859a4aca3969efd91dc77be7efa2ae45b05d8
diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c
index 65ddc5b8eb33..55da4d339293 100644
--- a/trunk/fs/nfsd/export.c
+++ b/trunk/fs/nfsd/export.c
@@ -1076,9 +1076,9 @@ exp_export(struct nfsctl_export *nxp)
 		err = 0;
 finish:
 	kfree(new.ex_pathname);
-	if (exp)
+	if (!IS_ERR_OR_NULL(exp))
 		exp_put(exp);
-	if (fsid_key && !IS_ERR(fsid_key))
+	if (!IS_ERR_OR_NULL(fsid_key))
 		cache_put(&fsid_key->h, &svc_expkey_cache);
 	path_put(&path);
 out_put_clp: