LU-6070 libcfs: provide separate buffers for libcfs_*2str()

[fs/lustre-release.git] / lustre / target / tgt_handler.c

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index 262e503..f0f1ed6 100644 (file)
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * lustre/target/tgt_handler.c
@@ -740,11 +740,10 @@ static inline void tgt_init_sec_none(struct obd_connect_data *reply)
 static int tgt_init_sec_level(struct ptlrpc_request *req)
 {
        struct lu_target        *tgt = class_exp2tgt(req->rq_export);
-       char                    *client = libcfs_nid2str(req->rq_peer.nid);
+       char                    *client;
        struct obd_connect_data *data, *reply;
        int                      rc = 0;
        bool                     remote;
-
        ENTRY;
 
        data = req_capsule_client_get(&req->rq_pill, &RMF_CONNECT_DATA);
@@ -758,6 +757,7 @@ static int tgt_init_sec_level(struct ptlrpc_request *req)
                RETURN(0);
        }
 
+       client = libcfs_nid2str(req->rq_peer.nid);
        /* no GSS support case */
        if (!req->rq_auth_gss) {
                if (tgt->lut_sec_level > LUSTRE_SEC_NONE) {
@@ -998,13 +998,11 @@ int tgt_obd_log_cancel(struct tgt_session_info *tsi)
 {
        return err_serious(-EOPNOTSUPP);
 }
-EXPORT_SYMBOL(tgt_obd_log_cancel);
 
 int tgt_obd_qc_callback(struct tgt_session_info *tsi)
 {
        return err_serious(-EOPNOTSUPP);
 }
-EXPORT_SYMBOL(tgt_obd_qc_callback);
 
 int tgt_sendpage(struct tgt_session_info *tsi, struct lu_rdpg *rdpg, int nob)
 {
@@ -1127,7 +1125,6 @@ out:
        }
        return rc;
 }
-EXPORT_SYMBOL(tgt_obd_idx_read);
 
 struct tgt_handler tgt_obd_handlers[] = {
 TGT_OBD_HDL    (0,     OBD_PING,               tgt_obd_ping),
@@ -1240,6 +1237,20 @@ int tgt_enqueue(struct tgt_session_info *tsi)
        if (rc)
                RETURN(err_serious(rc));
 
+       switch (LUT_FAIL_CLASS(tsi->tsi_reply_fail_id)) {
+       case LUT_FAIL_MDT:
+               tsi->tsi_reply_fail_id = OBD_FAIL_MDS_LDLM_REPLY_NET;
+               break;
+       case LUT_FAIL_OST:
+               tsi->tsi_reply_fail_id = OBD_FAIL_OST_LDLM_REPLY_NET;
+               break;
+       case LUT_FAIL_MGT:
+               tsi->tsi_reply_fail_id = OBD_FAIL_MGS_LDLM_REPLY_NET;
+               break;
+       default:
+               tsi->tsi_reply_fail_id = OBD_FAIL_LDLM_REPLY;
+               break;
+       }
        RETURN(req->rq_status);
 }
 EXPORT_SYMBOL(tgt_enqueue);
@@ -1257,19 +1268,16 @@ int tgt_convert(struct tgt_session_info *tsi)
 
        RETURN(req->rq_status);
 }
-EXPORT_SYMBOL(tgt_convert);
 
 int tgt_bl_callback(struct tgt_session_info *tsi)
 {
        return err_serious(-EOPNOTSUPP);
 }
-EXPORT_SYMBOL(tgt_bl_callback);
 
 int tgt_cp_callback(struct tgt_session_info *tsi)
 {
        return err_serious(-EOPNOTSUPP);
 }
-EXPORT_SYMBOL(tgt_cp_callback);
 
 /* generic LDLM target handler */
 struct tgt_handler tgt_dlm_handlers[] = {
@@ -1318,7 +1326,6 @@ int tgt_llog_destroy(struct tgt_session_info *tsi)
 
        RETURN(rc);
 }
-EXPORT_SYMBOL(tgt_llog_destroy);
 
 int tgt_llog_read_header(struct tgt_session_info *tsi)
 {
@@ -1566,7 +1573,6 @@ int tgt_brw_lock(struct ldlm_namespace *ns, struct ldlm_res_id *res_id,
                               nb[nrbufs - 1].rnb_len - 1,
                               lh, mode, &flags));
 }
-EXPORT_SYMBOL(tgt_brw_lock);
 
 void tgt_brw_unlock(struct obd_ioobj *obj, struct niobuf_remote *niob,
                    struct lustre_handle *lh, int mode)
@@ -1582,7 +1588,6 @@ void tgt_brw_unlock(struct obd_ioobj *obj, struct niobuf_remote *niob,
                tgt_extent_unlock(lh, mode);
        EXIT;
 }
-EXPORT_SYMBOL(tgt_brw_unlock);
 
 static __u32 tgt_checksum_bulk(struct lu_target *tgt,
                               struct ptlrpc_bulk_desc *desc, int opc,
@@ -1852,15 +1857,13 @@ static void tgt_warn_on_cksum(struct ptlrpc_request *req,
 {
        struct obd_export *exp = req->rq_export;
        struct ost_body *body;
-       char *router;
-       char *via;
+       char *router = "";
+       char *via = "";
 
        body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
        LASSERT(body != NULL);
 
-       if (req->rq_peer.nid == desc->bd_sender) {
-               via = router = "";
-       } else {
+       if (req->rq_peer.nid != desc->bd_sender) {
                via = " via ";
                router = libcfs_nid2str(desc->bd_sender);
        }