These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lustre / obdclass / llog_obd.c

diff --git a/kernel/drivers/staging/lustre/lustre/obdclass/llog_obd.c b/kernel/drivers/staging/lustre/lustre/obdclass/llog_obd.c
index 978d886..3900b9d 100644 (file)
--- a/kernel/drivers/staging/lustre/lustre/obdclass/llog_obd.c
+++ b/kernel/drivers/staging/lustre/lustre/obdclass/llog_obd.c
@@ -36,7 +36,6 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-
 #include "../include/obd_class.h"
 #include "../include/lustre_log.h"
 #include "llog_internal.h"
@@ -46,7 +45,7 @@ static struct llog_ctxt *llog_new_ctxt(struct obd_device *obd)
 {
        struct llog_ctxt *ctxt;
 
-       OBD_ALLOC_PTR(ctxt);
+       ctxt = kzalloc(sizeof(*ctxt), GFP_NOFS);
        if (!ctxt)
                return NULL;
 
@@ -66,7 +65,7 @@ static void llog_ctxt_destroy(struct llog_ctxt *ctxt)
                class_import_put(ctxt->loc_imp);
                ctxt->loc_imp = NULL;
        }
-       OBD_FREE_PTR(ctxt);
+       kfree(ctxt);
 }
 
 int __llog_ctxt_put(const struct lu_env *env, struct llog_ctxt *ctxt)
@@ -212,36 +211,6 @@ int llog_setup(const struct lu_env *env, struct obd_device *obd,
 }
 EXPORT_SYMBOL(llog_setup);
 
-int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags)
-{
-       int rc = 0;
-
-       if (!ctxt)
-               return 0;
-
-       if (CTXTP(ctxt, sync))
-               rc = CTXTP(ctxt, sync)(ctxt, exp, flags);
-
-       return rc;
-}
-EXPORT_SYMBOL(llog_sync);
-
-int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt,
-               struct llog_cookie *cookies, int flags)
-{
-       int rc;
-
-       if (!ctxt) {
-               CERROR("No ctxt\n");
-               return -ENODEV;
-       }
-
-       CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP);
-       rc = CTXTP(ctxt, cancel)(env, ctxt, cookies, flags);
-       return rc;
-}
-EXPORT_SYMBOL(llog_cancel);
-
 /* context key constructor/destructor: llog_key_init, llog_key_fini */
 LU_KEY_INIT_FINI(llog, struct llog_thread_info);
 /* context key: llog_thread_key */