From owner-svn-src-head@FreeBSD.ORG Sat Apr 4 22:11:40 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED7B3D6A; Sat, 4 Apr 2015 22:11:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEEB11BD; Sat, 4 Apr 2015 22:11:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t34MBd8q097599; Sat, 4 Apr 2015 22:11:39 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t34MBcnr097596; Sat, 4 Apr 2015 22:11:38 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201504042211.t34MBcnr097596@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 4 Apr 2015 22:11:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281088 - head/sys/dev/iscsi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Apr 2015 22:11:40 -0000 Author: trasz Date: Sat Apr 4 22:11:38 2015 New Revision: 281088 URL: https://svnweb.freebsd.org/changeset/base/281088 Log: Remove icl_conn_connected(); was unused. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/iscsi/icl_conn_if.m head/sys/dev/iscsi/icl_soft.c head/sys/dev/iscsi/icl_wrappers.h Modified: head/sys/dev/iscsi/icl_conn_if.m ============================================================================== --- head/sys/dev/iscsi/icl_conn_if.m Sat Apr 4 22:05:43 2015 (r281087) +++ head/sys/dev/iscsi/icl_conn_if.m Sat Apr 4 22:11:38 2015 (r281088) @@ -82,10 +82,6 @@ METHOD void close { struct icl_conn *_ic; }; -METHOD bool connected { - struct icl_conn *_ic; -}; - METHOD int task_setup { struct icl_conn *_ic; struct ccb_scsiio *_csio; Modified: head/sys/dev/iscsi/icl_soft.c ============================================================================== --- head/sys/dev/iscsi/icl_soft.c Sat Apr 4 22:05:43 2015 (r281087) +++ head/sys/dev/iscsi/icl_soft.c Sat Apr 4 22:11:38 2015 (r281088) @@ -97,7 +97,6 @@ static icl_conn_pdu_queue_t icl_soft_con static icl_conn_handoff_t icl_soft_conn_handoff; static icl_conn_free_t icl_soft_conn_free; static icl_conn_close_t icl_soft_conn_close; -static icl_conn_connected_t icl_soft_conn_connected; static icl_conn_task_setup_t icl_soft_conn_task_setup; static icl_conn_task_done_t icl_soft_conn_task_done; static icl_conn_transfer_setup_t icl_soft_conn_transfer_setup; @@ -114,7 +113,6 @@ static kobj_method_t icl_soft_methods[] KOBJMETHOD(icl_conn_handoff, icl_soft_conn_handoff), KOBJMETHOD(icl_conn_free, icl_soft_conn_free), KOBJMETHOD(icl_conn_close, icl_soft_conn_close), - KOBJMETHOD(icl_conn_connected, icl_soft_conn_connected), KOBJMETHOD(icl_conn_task_setup, icl_soft_conn_task_setup), KOBJMETHOD(icl_conn_task_done, icl_soft_conn_task_done), KOBJMETHOD(icl_conn_transfer_setup, icl_soft_conn_transfer_setup), @@ -1425,24 +1423,6 @@ icl_soft_conn_close(struct icl_conn *ic) ICL_CONN_UNLOCK(ic); } -bool -icl_soft_conn_connected(struct icl_conn *ic) -{ - ICL_CONN_LOCK_ASSERT_NOT(ic); - - ICL_CONN_LOCK(ic); - if (ic->ic_socket == NULL) { - ICL_CONN_UNLOCK(ic); - return (false); - } - if (ic->ic_socket->so_error != 0) { - ICL_CONN_UNLOCK(ic); - return (false); - } - ICL_CONN_UNLOCK(ic); - return (true); -} - int icl_soft_conn_task_setup(struct icl_conn *ic, struct ccb_scsiio *csio, uint32_t *task_tagp, void **prvp) Modified: head/sys/dev/iscsi/icl_wrappers.h ============================================================================== --- head/sys/dev/iscsi/icl_wrappers.h Sat Apr 4 22:05:43 2015 (r281087) +++ head/sys/dev/iscsi/icl_wrappers.h Sat Apr 4 22:11:38 2015 (r281088) @@ -105,13 +105,6 @@ icl_conn_close(struct icl_conn *ic) ICL_CONN_CLOSE(ic); } -static inline bool -icl_conn_connected(struct icl_conn *ic) -{ - - return (ICL_CONN_CONNECTED(ic)); -} - static inline int icl_conn_task_setup(struct icl_conn *ic, struct ccb_scsiio *csio, uint32_t *task_tagp, void **prvp)