- small cleanups.

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index 46f4ce2..867ad2d 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -341,7 +341,8 @@ static void mdd_ucred_key_fini(const struct lu_context *ctx,
                              struct lu_context_key *key, void *data)
 {
         struct md_ucred *uc = data;
-        OBD_FREE_PTR(uc);
+        if (!IS_ERR(uc))
+                OBD_FREE_PTR(uc);
 }
 
 static struct lu_context_key mdd_ucred_key = {
@@ -350,12 +351,13 @@ static struct lu_context_key mdd_ucred_key = {
         .lct_fini = mdd_ucred_key_fini
 };
 
-struct md_ucred *md_ucred(const struct lu_env *env)
+/* XXX: This seems not used? */
+struct md_ucred *md_ucred_get(const struct lu_env *env)
 {
         LASSERT(env->le_ses != NULL);
         return lu_context_key_get(env->le_ses, &mdd_ucred_key);
 }
-EXPORT_SYMBOL(md_ucred);
+EXPORT_SYMBOL(md_ucred_get);
 
 static void *mdd_capainfo_key_init(const struct lu_context *ctx,
                                    struct lu_context_key *key)
@@ -372,7 +374,8 @@ static void mdd_capainfo_key_fini(const struct lu_context *ctx,
                                   struct lu_context_key *key, void *data)
 {
         struct md_capainfo *ci = data;
-        OBD_FREE_PTR(ci);
+        if (!IS_ERR(ci))
+                OBD_FREE_PTR(ci);
 }
 
 struct lu_context_key mdd_capainfo_key = {