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: