mirror of
https://github.com/SCST-project/scst.git
synced 2026-08-17 04:36:22 +00:00
Improve release logging
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6478 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
+12
-10
@@ -429,8 +429,8 @@ static void __iscsi_state_change(struct sock *sk)
|
||||
|
||||
if (unlikely(sk->sk_state != TCP_ESTABLISHED)) {
|
||||
if (!conn->closing) {
|
||||
PRINT_ERROR("Connection with initiator %s "
|
||||
"unexpectedly closed!",
|
||||
PRINT_ERROR("Connection %p with initiator %s "
|
||||
"unexpectedly closed!", conn,
|
||||
conn->session->initiator_name);
|
||||
TRACE_MGMT_DBG("conn %p, sk state %d", conn,
|
||||
sk->sk_state);
|
||||
@@ -534,11 +534,11 @@ static void conn_rsp_timer_fn(unsigned long arg)
|
||||
if (!conn->closing) {
|
||||
PRINT_ERROR("Timeout %ld sec sending data/waiting "
|
||||
"for reply to/from initiator "
|
||||
"%s (SID %llx), closing connection",
|
||||
"%s (SID %llx), closing connection %p",
|
||||
iscsi_get_timeout(cmnd)/HZ,
|
||||
conn->session->initiator_name,
|
||||
(unsigned long long int)
|
||||
conn->session->sid);
|
||||
(unsigned long long int) conn->session->sid,
|
||||
conn);
|
||||
/*
|
||||
* We must call mark_conn_closed() outside of
|
||||
* write_list_lock or we will have a circular
|
||||
@@ -812,8 +812,9 @@ void conn_free(struct iscsi_conn *conn)
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
TRACE_MGMT_DBG("Freeing conn %p (sess=%p, %#Lx %u)", conn,
|
||||
session, (unsigned long long int)session->sid, conn->cid);
|
||||
TRACE(TRACE_MGMT, "Freeing conn %p (sess=%p, %#Lx %u, initiator %s)",
|
||||
conn, session, (unsigned long long int)session->sid, conn->cid,
|
||||
session->scst_sess->initiator_name);
|
||||
|
||||
lockdep_assert_held(&conn->target->target_mutex);
|
||||
|
||||
@@ -928,8 +929,9 @@ int iscsi_conn_alloc(struct iscsi_session *session,
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
TRACE_MGMT_DBG("Creating connection %p for sid %#Lx, cid %u", conn,
|
||||
(unsigned long long int)session->sid, info->cid);
|
||||
TRACE(TRACE_MGMT, "Creating connection %p for sid %#Lx, cid %u "
|
||||
"(initiator %s)", conn, (unsigned long long int)session->sid,
|
||||
info->cid, session->scst_sess->initiator_name);
|
||||
|
||||
conn->transport = t;
|
||||
|
||||
@@ -1010,7 +1012,7 @@ int __add_conn(struct iscsi_session *session, struct iscsi_kern_conn_info *info)
|
||||
goto out;
|
||||
|
||||
if (reinstatement) {
|
||||
TRACE_MGMT_DBG("Reinstating conn (old %p, new %p)", conn,
|
||||
TRACE(TRACE_MGMT, "Reinstating conn (old %p, new %p)", conn,
|
||||
new_conn);
|
||||
conn->conn_reinst_successor = new_conn;
|
||||
__set_bit(ISCSI_CONN_REINSTATING, &new_conn->conn_aflags);
|
||||
|
||||
+14
-13
@@ -1400,7 +1400,7 @@ static int cmnd_insert_data_wait_hash(struct iscsi_cmnd *cmnd)
|
||||
|
||||
TRACE_DBG("%p:%x", cmnd, itt);
|
||||
if (unlikely(itt == ISCSI_RESERVED_TAG)) {
|
||||
PRINT_ERROR("%s", "ITT is RESERVED_TAG");
|
||||
PRINT_ERROR("ITT is RESERVED_TAG (conn %p)", cmnd->conn);
|
||||
PRINT_BUFFER("Incorrect BHS", &cmnd->pdu.bhs,
|
||||
sizeof(cmnd->pdu.bhs));
|
||||
err = -ISCSI_REASON_PROTOCOL_ERROR;
|
||||
@@ -1418,7 +1418,8 @@ static int cmnd_insert_data_wait_hash(struct iscsi_cmnd *cmnd)
|
||||
list_add_tail(&cmnd->hash_list_entry, head);
|
||||
cmnd->hashed = 1;
|
||||
} else {
|
||||
PRINT_ERROR("Task %x in progress, cmnd %p", itt, cmnd);
|
||||
PRINT_ERROR("Task %x in progress, cmnd %p (conn %p)",
|
||||
itt, cmnd, cmnd->conn);
|
||||
err = -ISCSI_REASON_TASK_IN_PROGRESS;
|
||||
}
|
||||
|
||||
@@ -1636,8 +1637,8 @@ static int cmnd_prepare_recv_pdu(struct iscsi_conn *conn,
|
||||
if (unlikely(i >= ISCSI_CONN_IOV_MAX)) {
|
||||
PRINT_ERROR("Initiator %s violated negotiated "
|
||||
"parameters by sending too much data (size "
|
||||
"left %d)", conn->session->initiator_name,
|
||||
size);
|
||||
"left %d), conn %p", conn->session->initiator_name,
|
||||
size, conn);
|
||||
mark_conn_closed(conn);
|
||||
res = -EINVAL;
|
||||
goto out;
|
||||
@@ -1875,8 +1876,8 @@ int iscsi_cmnd_set_write_buf(struct iscsi_cmnd *req)
|
||||
unsolicited_data_expected)) {
|
||||
PRINT_ERROR("Initiator %s violated negotiated "
|
||||
"parameters: initial R2T is required (ITT %x, "
|
||||
"op %x)", session->initiator_name,
|
||||
req->pdu.bhs.itt, req_hdr->scb[0]);
|
||||
"op %x, conn %p)", session->initiator_name,
|
||||
req->pdu.bhs.itt, req_hdr->scb[0], conn);
|
||||
res = -EINVAL;
|
||||
goto out_close;
|
||||
}
|
||||
@@ -1885,8 +1886,8 @@ int iscsi_cmnd_set_write_buf(struct iscsi_cmnd *req)
|
||||
req->pdu.datasize)) {
|
||||
PRINT_ERROR("Initiator %s violated negotiated "
|
||||
"parameters: forbidden immediate data sent "
|
||||
"(ITT %x, op %x)", session->initiator_name,
|
||||
req->pdu.bhs.itt, req_hdr->scb[0]);
|
||||
"(ITT %x, op %x, conn %p)", session->initiator_name,
|
||||
req->pdu.bhs.itt, req_hdr->scb[0], conn);
|
||||
res = -EINVAL;
|
||||
goto out_close;
|
||||
}
|
||||
@@ -1894,11 +1895,11 @@ int iscsi_cmnd_set_write_buf(struct iscsi_cmnd *req)
|
||||
if (unlikely(session->sess_params.first_burst_length < req->pdu.datasize)) {
|
||||
PRINT_ERROR("Initiator %s violated negotiated "
|
||||
"parameters: immediate data len (%d) > "
|
||||
"first_burst_length (%d) (ITT %x, op %x)",
|
||||
"first_burst_length (%d) (ITT %x, op %x, conn %p)",
|
||||
session->initiator_name,
|
||||
req->pdu.datasize,
|
||||
session->sess_params.first_burst_length,
|
||||
req->pdu.bhs.itt, req_hdr->scb[0]);
|
||||
req->pdu.bhs.itt, req_hdr->scb[0], conn);
|
||||
res = -EINVAL;
|
||||
goto out_close;
|
||||
}
|
||||
@@ -3184,10 +3185,10 @@ static int check_segment_length(struct iscsi_cmnd *cmnd)
|
||||
struct iscsi_session *session = conn->session;
|
||||
|
||||
if (unlikely(cmnd->pdu.datasize > session->sess_params.max_recv_data_length)) {
|
||||
PRINT_ERROR("Initiator %s violated negotiated parameters: "
|
||||
PRINT_ERROR("Initiator %s (conn %p) violated negotiated parameters: "
|
||||
"data too long (ITT %x, datasize %u, "
|
||||
"max_recv_data_length %u", session->initiator_name,
|
||||
cmnd->pdu.bhs.itt, cmnd->pdu.datasize,
|
||||
"max_recv_data_length %u)", session->initiator_name,
|
||||
conn, cmnd->pdu.bhs.itt, cmnd->pdu.datasize,
|
||||
session->sess_params.max_recv_data_length);
|
||||
mark_conn_closed(conn);
|
||||
return -EINVAL;
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_MGMT_DEBUG | \
|
||||
TRACE_MINOR | TRACE_SPECIAL | TRACE_CONN_OC)
|
||||
#else
|
||||
#define ISCSI_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | \
|
||||
#define ISCSI_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_PID | \
|
||||
TRACE_SPECIAL)
|
||||
#endif
|
||||
|
||||
|
||||
@@ -393,8 +393,8 @@ int isert_pdu_sent(struct iscsi_cmnd *pdu)
|
||||
target_del_all_sess(target, 0);
|
||||
mutex_unlock(&target->target_mutex);
|
||||
} else {
|
||||
PRINT_INFO("Closing connection at initiator's %s "
|
||||
"request", conn->session->initiator_name);
|
||||
PRINT_INFO("Closing connection %p at initiator's %s "
|
||||
"request", conn, conn->session->initiator_name);
|
||||
mark_conn_closed(conn);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_MGMT_DEBUG | \
|
||||
TRACE_MINOR | TRACE_SPECIAL)
|
||||
#else
|
||||
#define ISERT_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | \
|
||||
#define ISERT_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_PID | \
|
||||
TRACE_SPECIAL)
|
||||
#endif
|
||||
|
||||
|
||||
@@ -759,7 +759,8 @@ restart:
|
||||
goto restart;
|
||||
default:
|
||||
if (!conn->closing) {
|
||||
PRINT_ERROR("sock_recvmsg() failed: %d", res);
|
||||
PRINT_ERROR("sock_recvmsg() failed: %d (conn %p)",
|
||||
res, conn);
|
||||
mark_conn_closed(conn);
|
||||
}
|
||||
if (res == 0)
|
||||
@@ -967,9 +968,9 @@ static int process_read_io(struct iscsi_conn *conn, int *closed)
|
||||
res = digest_rx_header(cmnd);
|
||||
if (unlikely(res != 0)) {
|
||||
PRINT_ERROR("rx header digest for "
|
||||
"initiator %s failed (%d)",
|
||||
"initiator %s (conn %p) failed (%d)",
|
||||
conn->session->initiator_name,
|
||||
res);
|
||||
conn, res);
|
||||
mark_conn_closed(conn);
|
||||
} else
|
||||
conn->read_state = RX_CMD_START;
|
||||
@@ -1092,7 +1093,7 @@ int istrd(void *arg)
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
PRINT_INFO("Read thread for pool %p started, PID %d", p, current->pid);
|
||||
PRINT_INFO("Read thread for pool %p started", p);
|
||||
|
||||
current->flags |= PF_NOFREEZE;
|
||||
rc = set_cpus_allowed_ptr(current, &p->cpu_mask);
|
||||
@@ -1113,7 +1114,7 @@ int istrd(void *arg)
|
||||
*/
|
||||
sBUG_ON(!list_empty(&p->rd_list));
|
||||
|
||||
PRINT_INFO("Read thread for PID %d for pool %p finished", current->pid, p);
|
||||
PRINT_INFO("Read thread for pool %p finished", p);
|
||||
|
||||
TRACE_EXIT();
|
||||
return 0;
|
||||
@@ -1600,9 +1601,9 @@ static int exit_tx(struct iscsi_conn *conn, int res)
|
||||
#else
|
||||
{
|
||||
#endif
|
||||
PRINT_ERROR("Sending data failed: initiator %s, "
|
||||
PRINT_ERROR("Sending data failed: initiator %s (conn %p), "
|
||||
"write_size %d, write_state %d, res %d",
|
||||
conn->session->initiator_name,
|
||||
conn->session->initiator_name, conn,
|
||||
conn->write_size,
|
||||
conn->write_state, res);
|
||||
}
|
||||
@@ -1860,7 +1861,7 @@ int istwr(void *arg)
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
PRINT_INFO("Write thread for pool %p started, PID %d", p, current->pid);
|
||||
PRINT_INFO("Write thread for pool %p started", p);
|
||||
|
||||
current->flags |= PF_NOFREEZE;
|
||||
rc = set_cpus_allowed_ptr(current, &p->cpu_mask);
|
||||
@@ -1881,7 +1882,7 @@ int istwr(void *arg)
|
||||
*/
|
||||
sBUG_ON(!list_empty(&p->wr_list));
|
||||
|
||||
PRINT_INFO("Write thread PID %d for pool %p finished", current->pid, p);
|
||||
PRINT_INFO("Write thread for pool %p finished", p);
|
||||
|
||||
TRACE_EXIT();
|
||||
return 0;
|
||||
|
||||
@@ -107,8 +107,9 @@ static int iscsi_session_alloc(struct iscsi_target *target,
|
||||
kfree(name);
|
||||
#endif
|
||||
|
||||
TRACE_MGMT_DBG("Session %p created: target %p, tid %u, sid %#Lx",
|
||||
session, target, target->tid, info->sid);
|
||||
TRACE(TRACE_MGMT, "Session %p created: target %p, tid %u, sid %#Lx, "
|
||||
"initiator %s", session, target, target->tid, info->sid,
|
||||
session->scst_sess->initiator_name);
|
||||
|
||||
*result = session;
|
||||
return 0;
|
||||
@@ -309,7 +310,7 @@ int session_free(struct iscsi_session *session, bool del)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
TRACE_MGMT_DBG("Freeing session %p (SID %llx)",
|
||||
TRACE(TRACE_MGMT, "Freeing session %p (SID %llx)",
|
||||
session, session->sid);
|
||||
|
||||
lockdep_assert_held(&session->target->target_mutex);
|
||||
@@ -392,11 +393,11 @@ void iscsi_sess_force_close(struct iscsi_session *sess)
|
||||
|
||||
lockdep_assert_held(&sess->target->target_mutex);
|
||||
|
||||
PRINT_INFO("Deleting session %llx with initiator %s (%p)",
|
||||
PRINT_INFO("Force closing session %llx with initiator %s (%p)",
|
||||
(unsigned long long int)sess->sid, sess->initiator_name, sess);
|
||||
|
||||
list_for_each_entry(conn, &sess->conn_list, conn_list_entry) {
|
||||
TRACE_MGMT_DBG("Deleting connection with initiator %p", conn);
|
||||
TRACE(TRACE_MGMT, "Force closing connection %p", conn);
|
||||
__mark_conn_closed(conn, ISCSI_CONN_ACTIVE_CLOSE|ISCSI_CONN_DELETING);
|
||||
}
|
||||
|
||||
|
||||
@@ -291,7 +291,8 @@ void target_del_session(struct iscsi_target *target,
|
||||
{
|
||||
TRACE_ENTRY();
|
||||
|
||||
TRACE_MGMT_DBG("Deleting session %p", session);
|
||||
TRACE(TRACE_MGMT, "Deleting session %p (initiator %s)", session,
|
||||
session->scst_sess->initiator_name);
|
||||
|
||||
lockdep_assert_held(&target->target_mutex);
|
||||
|
||||
@@ -299,7 +300,7 @@ void target_del_session(struct iscsi_target *target,
|
||||
struct iscsi_conn *conn, *tc;
|
||||
list_for_each_entry_safe(conn, tc, &session->conn_list,
|
||||
conn_list_entry) {
|
||||
TRACE_MGMT_DBG("Mark conn %p closing", conn);
|
||||
TRACE_MGMT_DBG("Del session: closing conn %p", conn);
|
||||
__mark_conn_closed(conn, flags);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
TRACE_MINOR | TRACE_SPECIAL)
|
||||
#else
|
||||
# ifdef CONFIG_SCST_TRACING
|
||||
#define Q2T_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | \
|
||||
#define Q2T_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_PID | \
|
||||
TRACE_SPECIAL)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+51
-51
@@ -220,6 +220,26 @@ do { \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define PRINT_LOG_FLAG(log_flag, format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_INFO, __LOG_PREFIX, \
|
||||
__func__, __LINE__, format, ## args)
|
||||
|
||||
#define PRINT_WARNING(format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_WARNING, __LOG_PREFIX, \
|
||||
__func__, __LINE__, "***WARNING***: " format, ## args)
|
||||
|
||||
#define PRINT_ERROR(format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_ERR, __LOG_PREFIX, \
|
||||
__func__, __LINE__, "***ERROR***: " format, ## args)
|
||||
|
||||
#define PRINT_CRIT_ERROR(format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_CRIT, __LOG_PREFIX, \
|
||||
__func__, __LINE__, "***CRITICAL ERROR***: " format, ## args)
|
||||
|
||||
#define PRINT_INFO(format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_INFO, __LOG_PREFIX, \
|
||||
__func__, __LINE__, format, ## args)
|
||||
|
||||
#else /* CONFIG_SCST_DEBUG || CONFIG_SCST_TRACING */
|
||||
|
||||
#define TRACING_MINOR() (false)
|
||||
@@ -231,6 +251,37 @@ do { \
|
||||
#define PRINT_BUFF_FLAG(flag, message, buff, len) \
|
||||
((void)(flag), (void)(message), (void)(buff), (void)(len))
|
||||
|
||||
#ifdef LOG_PREFIX
|
||||
|
||||
#define PRINT_INFO(format, args...) \
|
||||
PRINT(KERN_INFO, "%s: " format, LOG_PREFIX, ## args)
|
||||
|
||||
#define PRINT_WARNING(format, args...) \
|
||||
PRINT(KERN_WARNING, "%s: ***WARNING***: " format, LOG_PREFIX, ## args)
|
||||
|
||||
#define PRINT_ERROR(format, args...) \
|
||||
PRINT(KERN_ERR, "%s: ***ERROR***: " format, LOG_PREFIX, ## args)
|
||||
|
||||
#define PRINT_CRIT_ERROR(format, args...) \
|
||||
PRINT(KERN_CRIT, "%s: ***CRITICAL ERROR***: " \
|
||||
format, LOG_PREFIX, ## args)
|
||||
|
||||
#else /* LOG_PREFIX */
|
||||
|
||||
#define PRINT_INFO(format, args...) \
|
||||
PRINT(KERN_INFO, format, ## args)
|
||||
|
||||
#define PRINT_WARNING(format, args...) \
|
||||
PRINT(KERN_WARNING, "***WARNING***: " format, ## args)
|
||||
|
||||
#define PRINT_ERROR(format, args...) \
|
||||
PRINT(KERN_ERR, "***ERROR***: " format, ## args)
|
||||
|
||||
#define PRINT_CRIT_ERROR(format, args...) \
|
||||
PRINT(KERN_CRIT, "***CRITICAL ERROR***: " format, ## args)
|
||||
|
||||
#endif /* LOG_PREFIX */
|
||||
|
||||
#endif /* CONFIG_SCST_DEBUG || CONFIG_SCST_TRACING */
|
||||
|
||||
#ifdef CONFIG_SCST_DEBUG
|
||||
@@ -278,26 +329,6 @@ do { \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define PRINT_LOG_FLAG(log_flag, format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_INFO, __LOG_PREFIX, \
|
||||
__func__, __LINE__, format, ## args)
|
||||
|
||||
#define PRINT_WARNING(format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_WARNING, __LOG_PREFIX, \
|
||||
__func__, __LINE__, "***WARNING***: " format, ## args)
|
||||
|
||||
#define PRINT_ERROR(format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_ERR, __LOG_PREFIX, \
|
||||
__func__, __LINE__, "***ERROR***: " format, ## args)
|
||||
|
||||
#define PRINT_CRIT_ERROR(format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_CRIT, __LOG_PREFIX, \
|
||||
__func__, __LINE__, "***CRITICAL ERROR***: " format, ## args)
|
||||
|
||||
#define PRINT_INFO(format, args...) \
|
||||
debug_print_with_prefix(trace_flag, KERN_INFO, __LOG_PREFIX, \
|
||||
__func__, __LINE__, format, ## args)
|
||||
|
||||
#ifndef GENERATING_UPSTREAM_PATCH
|
||||
#define TRACE_ENTRY() \
|
||||
do { \
|
||||
@@ -378,37 +409,6 @@ do { \
|
||||
#define TRACE_EXIT_HRES(res) do {} while (0)
|
||||
#endif
|
||||
|
||||
#ifdef LOG_PREFIX
|
||||
|
||||
#define PRINT_INFO(format, args...) \
|
||||
PRINT(KERN_INFO, "%s: " format, LOG_PREFIX, ## args)
|
||||
|
||||
#define PRINT_WARNING(format, args...) \
|
||||
PRINT(KERN_WARNING, "%s: ***WARNING***: " format, LOG_PREFIX, ## args)
|
||||
|
||||
#define PRINT_ERROR(format, args...) \
|
||||
PRINT(KERN_ERR, "%s: ***ERROR***: " format, LOG_PREFIX, ## args)
|
||||
|
||||
#define PRINT_CRIT_ERROR(format, args...) \
|
||||
PRINT(KERN_CRIT, "%s: ***CRITICAL ERROR***: " \
|
||||
format, LOG_PREFIX, ## args)
|
||||
|
||||
#else
|
||||
|
||||
#define PRINT_INFO(format, args...) \
|
||||
PRINT(KERN_INFO, format, ## args)
|
||||
|
||||
#define PRINT_WARNING(format, args...) \
|
||||
PRINT(KERN_WARNING, "***WARNING***: " format, ## args)
|
||||
|
||||
#define PRINT_ERROR(format, args...) \
|
||||
PRINT(KERN_ERR, "***ERROR***: " format, ## args)
|
||||
|
||||
#define PRINT_CRIT_ERROR(format, args...) \
|
||||
PRINT(KERN_CRIT, "***CRITICAL ERROR***: " format, ## args)
|
||||
|
||||
#endif /* LOG_PREFIX */
|
||||
|
||||
#endif /* CONFIG_SCST_DEBUG */
|
||||
|
||||
#if defined(CONFIG_SCST_DEBUG) && defined(CONFIG_DEBUG_SLAB)
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
TRACE_LINE | TRACE_FUNCTION | TRACE_MGMT | TRACE_MINOR | \
|
||||
TRACE_MGMT_DEBUG | TRACE_SPECIAL)
|
||||
#else
|
||||
#define SCST_DEFAULT_DEV_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | \
|
||||
#define SCST_DEFAULT_DEV_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_PID | \
|
||||
TRACE_SPECIAL)
|
||||
#endif
|
||||
|
||||
|
||||
@@ -3753,7 +3753,7 @@ static int dev_user_cleanup_thread(void *arg)
|
||||
{
|
||||
TRACE_ENTRY();
|
||||
|
||||
PRINT_INFO("Cleanup thread started, PID %d", current->pid);
|
||||
PRINT_INFO("Cleanup thread started");
|
||||
|
||||
current->flags |= PF_NOFREEZE;
|
||||
|
||||
@@ -3811,7 +3811,7 @@ static int dev_user_cleanup_thread(void *arg)
|
||||
*/
|
||||
sBUG_ON(!list_empty(&cleanup_list));
|
||||
|
||||
PRINT_INFO("Cleanup thread PID %d finished", current->pid);
|
||||
PRINT_INFO("Cleanup thread finished");
|
||||
|
||||
TRACE_EXIT();
|
||||
return 0;
|
||||
|
||||
+3
-4
@@ -4624,8 +4624,7 @@ static int scst_ioc_keeper_thread(void *arg)
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
TRACE_MGMT_DBG("AIC %p keeper thread %s (PID %d) started", aic_keeper,
|
||||
current->comm, current->pid);
|
||||
TRACE_MGMT_DBG("AIC %p keeper thread %s started", aic_keeper, current->comm);
|
||||
|
||||
current->flags |= PF_NOFREEZE;
|
||||
|
||||
@@ -4651,8 +4650,8 @@ static int scst_ioc_keeper_thread(void *arg)
|
||||
wait_event_interruptible(aic_keeper->aic_keeper_waitQ,
|
||||
kthread_should_stop());
|
||||
|
||||
TRACE_MGMT_DBG("AIC %p keeper thread %s (PID %d) finished", aic_keeper,
|
||||
current->comm, current->pid);
|
||||
TRACE_MGMT_DBG("AIC %p keeper thread %s finished", aic_keeper,
|
||||
current->comm);
|
||||
|
||||
TRACE_EXIT();
|
||||
return 0;
|
||||
|
||||
@@ -61,7 +61,7 @@ extern unsigned long scst_trace_flag;
|
||||
#else /* CONFIG_SCST_DEBUG */
|
||||
|
||||
# ifdef CONFIG_SCST_TRACING
|
||||
#define SCST_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | \
|
||||
#define SCST_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_PID | \
|
||||
TRACE_SPECIAL)
|
||||
# else
|
||||
#define SCST_DEFAULT_LOG_FLAGS 0
|
||||
|
||||
@@ -493,7 +493,7 @@ static int sysfs_work_thread_fn(void *arg)
|
||||
TRACE_ENTRY();
|
||||
|
||||
if (!one_time_only)
|
||||
PRINT_INFO("User interface thread started, PID %d", current->pid);
|
||||
PRINT_INFO("User interface thread started");
|
||||
|
||||
current->flags |= PF_NOFREEZE;
|
||||
|
||||
@@ -516,7 +516,7 @@ static int sysfs_work_thread_fn(void *arg)
|
||||
*/
|
||||
sBUG_ON(!list_empty(&sysfs_work_list));
|
||||
|
||||
PRINT_INFO("User interface thread PID %d finished", current->pid);
|
||||
PRINT_INFO("User interface thread finished");
|
||||
}
|
||||
|
||||
TRACE_EXIT();
|
||||
|
||||
+8
-10
@@ -4674,7 +4674,7 @@ int scst_init_thread(void *arg)
|
||||
{
|
||||
TRACE_ENTRY();
|
||||
|
||||
PRINT_INFO("Init thread started, PID %d", current->pid);
|
||||
PRINT_INFO("Init thread started");
|
||||
|
||||
current->flags |= PF_NOFREEZE;
|
||||
|
||||
@@ -4695,7 +4695,7 @@ int scst_init_thread(void *arg)
|
||||
*/
|
||||
sBUG_ON(!list_empty(&scst_init_cmd_list));
|
||||
|
||||
PRINT_INFO("Init thread PID %d finished", current->pid);
|
||||
PRINT_INFO("Init thread finished");
|
||||
|
||||
TRACE_EXIT();
|
||||
return 0;
|
||||
@@ -5001,8 +5001,7 @@ int scst_cmd_thread(void *arg)
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
TRACE(TRACE_MINOR, "Processing thread %s (PID %d) started",
|
||||
current->comm, current->pid);
|
||||
TRACE(TRACE_MINOR, "Processing thread %s started", current->comm);
|
||||
|
||||
#if 0
|
||||
set_user_nice(current, 10);
|
||||
@@ -5030,8 +5029,7 @@ int scst_cmd_thread(void *arg)
|
||||
|
||||
scst_ioctx_put(p_cmd_threads);
|
||||
|
||||
TRACE(TRACE_MINOR, "Processing thread %s (PID %d) finished",
|
||||
current->comm, current->pid);
|
||||
TRACE(TRACE_MINOR, "Processing thread %s finished", current->comm);
|
||||
|
||||
TRACE_EXIT();
|
||||
return 0;
|
||||
@@ -6638,7 +6636,7 @@ int scst_tm_thread(void *arg)
|
||||
{
|
||||
TRACE_ENTRY();
|
||||
|
||||
PRINT_INFO("Task management thread started, PID %d", current->pid);
|
||||
PRINT_INFO("Task management thread started");
|
||||
|
||||
current->flags |= PF_NOFREEZE;
|
||||
|
||||
@@ -6688,7 +6686,7 @@ int scst_tm_thread(void *arg)
|
||||
*/
|
||||
sBUG_ON(!list_empty(&scst_active_mgmt_cmd_list));
|
||||
|
||||
PRINT_INFO("Task management thread PID %d finished", current->pid);
|
||||
PRINT_INFO("Task management thread finished");
|
||||
|
||||
TRACE_EXIT();
|
||||
return 0;
|
||||
@@ -7458,7 +7456,7 @@ int scst_global_mgmt_thread(void *arg)
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
PRINT_INFO("Management thread started, PID %d", current->pid);
|
||||
PRINT_INFO("Management thread started");
|
||||
|
||||
current->flags |= PF_NOFREEZE;
|
||||
|
||||
@@ -7529,7 +7527,7 @@ int scst_global_mgmt_thread(void *arg)
|
||||
sBUG_ON(!list_empty(&scst_sess_init_list));
|
||||
sBUG_ON(!list_empty(&scst_sess_shut_list));
|
||||
|
||||
PRINT_INFO("Management thread PID %d finished", current->pid);
|
||||
PRINT_INFO("Management thread finished");
|
||||
|
||||
TRACE_EXIT();
|
||||
return 0;
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
TRACE_MINOR | TRACE_SPECIAL)
|
||||
#else
|
||||
# ifdef CONFIG_SCST_TRACING
|
||||
#define SCST_LOCAL_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | \
|
||||
#define SCST_LOCAL_DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_PID | \
|
||||
TRACE_SPECIAL)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+1
-1
@@ -55,7 +55,7 @@ char *app_name;
|
||||
#else /* DEBUG */
|
||||
|
||||
# ifdef TRACING
|
||||
#define DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | \
|
||||
#define DEFAULT_LOG_FLAGS (TRACE_OUT_OF_MEM | TRACE_MGMT | TRACE_PID | \
|
||||
TRACE_TIME | TRACE_SPECIAL)
|
||||
# else
|
||||
#define DEFAULT_LOG_FLAGS 0
|
||||
|
||||
Reference in New Issue
Block a user