hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/target/iscsi/iscsi_target_configfs.c
....@@ -508,102 +508,102 @@
508508 spin_lock_bh(&se_nacl->nacl_sess_lock);
509509 se_sess = se_nacl->nacl_sess;
510510 if (!se_sess) {
511
- rb += sprintf(page+rb, "No active iSCSI Session for Initiator"
511
+ rb += sysfs_emit_at(page, rb, "No active iSCSI Session for Initiator"
512512 " Endpoint: %s\n", se_nacl->initiatorname);
513513 } else {
514514 sess = se_sess->fabric_sess_ptr;
515515
516
- rb += sprintf(page+rb, "InitiatorName: %s\n",
516
+ rb += sysfs_emit_at(page, rb, "InitiatorName: %s\n",
517517 sess->sess_ops->InitiatorName);
518
- rb += sprintf(page+rb, "InitiatorAlias: %s\n",
518
+ rb += sysfs_emit_at(page, rb, "InitiatorAlias: %s\n",
519519 sess->sess_ops->InitiatorAlias);
520520
521
- rb += sprintf(page+rb,
521
+ rb += sysfs_emit_at(page, rb,
522522 "LIO Session ID: %u ISID: 0x%6ph TSIH: %hu ",
523523 sess->sid, sess->isid, sess->tsih);
524
- rb += sprintf(page+rb, "SessionType: %s\n",
524
+ rb += sysfs_emit_at(page, rb, "SessionType: %s\n",
525525 (sess->sess_ops->SessionType) ?
526526 "Discovery" : "Normal");
527
- rb += sprintf(page+rb, "Session State: ");
527
+ rb += sysfs_emit_at(page, rb, "Session State: ");
528528 switch (sess->session_state) {
529529 case TARG_SESS_STATE_FREE:
530
- rb += sprintf(page+rb, "TARG_SESS_FREE\n");
530
+ rb += sysfs_emit_at(page, rb, "TARG_SESS_FREE\n");
531531 break;
532532 case TARG_SESS_STATE_ACTIVE:
533
- rb += sprintf(page+rb, "TARG_SESS_STATE_ACTIVE\n");
533
+ rb += sysfs_emit_at(page, rb, "TARG_SESS_STATE_ACTIVE\n");
534534 break;
535535 case TARG_SESS_STATE_LOGGED_IN:
536
- rb += sprintf(page+rb, "TARG_SESS_STATE_LOGGED_IN\n");
536
+ rb += sysfs_emit_at(page, rb, "TARG_SESS_STATE_LOGGED_IN\n");
537537 break;
538538 case TARG_SESS_STATE_FAILED:
539
- rb += sprintf(page+rb, "TARG_SESS_STATE_FAILED\n");
539
+ rb += sysfs_emit_at(page, rb, "TARG_SESS_STATE_FAILED\n");
540540 break;
541541 case TARG_SESS_STATE_IN_CONTINUE:
542
- rb += sprintf(page+rb, "TARG_SESS_STATE_IN_CONTINUE\n");
542
+ rb += sysfs_emit_at(page, rb, "TARG_SESS_STATE_IN_CONTINUE\n");
543543 break;
544544 default:
545
- rb += sprintf(page+rb, "ERROR: Unknown Session"
545
+ rb += sysfs_emit_at(page, rb, "ERROR: Unknown Session"
546546 " State!\n");
547547 break;
548548 }
549549
550
- rb += sprintf(page+rb, "---------------------[iSCSI Session"
550
+ rb += sysfs_emit_at(page, rb, "---------------------[iSCSI Session"
551551 " Values]-----------------------\n");
552
- rb += sprintf(page+rb, " CmdSN/WR : CmdSN/WC : ExpCmdSN"
552
+ rb += sysfs_emit_at(page, rb, " CmdSN/WR : CmdSN/WC : ExpCmdSN"
553553 " : MaxCmdSN : ITT : TTT\n");
554554 max_cmd_sn = (u32) atomic_read(&sess->max_cmd_sn);
555
- rb += sprintf(page+rb, " 0x%08x 0x%08x 0x%08x 0x%08x"
555
+ rb += sysfs_emit_at(page, rb, " 0x%08x 0x%08x 0x%08x 0x%08x"
556556 " 0x%08x 0x%08x\n",
557557 sess->cmdsn_window,
558558 (max_cmd_sn - sess->exp_cmd_sn) + 1,
559559 sess->exp_cmd_sn, max_cmd_sn,
560560 sess->init_task_tag, sess->targ_xfer_tag);
561
- rb += sprintf(page+rb, "----------------------[iSCSI"
561
+ rb += sysfs_emit_at(page, rb, "----------------------[iSCSI"
562562 " Connections]-------------------------\n");
563563
564564 spin_lock(&sess->conn_lock);
565565 list_for_each_entry(conn, &sess->sess_conn_list, conn_list) {
566
- rb += sprintf(page+rb, "CID: %hu Connection"
566
+ rb += sysfs_emit_at(page, rb, "CID: %hu Connection"
567567 " State: ", conn->cid);
568568 switch (conn->conn_state) {
569569 case TARG_CONN_STATE_FREE:
570
- rb += sprintf(page+rb,
570
+ rb += sysfs_emit_at(page, rb,
571571 "TARG_CONN_STATE_FREE\n");
572572 break;
573573 case TARG_CONN_STATE_XPT_UP:
574
- rb += sprintf(page+rb,
574
+ rb += sysfs_emit_at(page, rb,
575575 "TARG_CONN_STATE_XPT_UP\n");
576576 break;
577577 case TARG_CONN_STATE_IN_LOGIN:
578
- rb += sprintf(page+rb,
578
+ rb += sysfs_emit_at(page, rb,
579579 "TARG_CONN_STATE_IN_LOGIN\n");
580580 break;
581581 case TARG_CONN_STATE_LOGGED_IN:
582
- rb += sprintf(page+rb,
582
+ rb += sysfs_emit_at(page, rb,
583583 "TARG_CONN_STATE_LOGGED_IN\n");
584584 break;
585585 case TARG_CONN_STATE_IN_LOGOUT:
586
- rb += sprintf(page+rb,
586
+ rb += sysfs_emit_at(page, rb,
587587 "TARG_CONN_STATE_IN_LOGOUT\n");
588588 break;
589589 case TARG_CONN_STATE_LOGOUT_REQUESTED:
590
- rb += sprintf(page+rb,
590
+ rb += sysfs_emit_at(page, rb,
591591 "TARG_CONN_STATE_LOGOUT_REQUESTED\n");
592592 break;
593593 case TARG_CONN_STATE_CLEANUP_WAIT:
594
- rb += sprintf(page+rb,
594
+ rb += sysfs_emit_at(page, rb,
595595 "TARG_CONN_STATE_CLEANUP_WAIT\n");
596596 break;
597597 default:
598
- rb += sprintf(page+rb,
598
+ rb += sysfs_emit_at(page, rb,
599599 "ERROR: Unknown Connection State!\n");
600600 break;
601601 }
602602
603
- rb += sprintf(page+rb, " Address %pISc %s", &conn->login_sockaddr,
603
+ rb += sysfs_emit_at(page, rb, " Address %pISc %s", &conn->login_sockaddr,
604604 (conn->network_transport == ISCSI_TCP) ?
605605 "TCP" : "SCTP");
606
- rb += sprintf(page+rb, " StatSN: 0x%08x\n",
606
+ rb += sysfs_emit_at(page, rb, " StatSN: 0x%08x\n",
607607 conn->stat_sn);
608608 }
609609 spin_unlock(&sess->conn_lock);