From owner-svn-src-all@freebsd.org Fri Apr 15 05:10:33 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82885AED4E6; Fri, 15 Apr 2016 05:10:33 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 5481E1D52; Fri, 15 Apr 2016 05:10:33 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3F5AWZq083768; Fri, 15 Apr 2016 05:10:32 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3F5AWG7083767; Fri, 15 Apr 2016 05:10:32 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201604150510.u3F5AWG7083767@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 15 Apr 2016 05:10:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298036 - head/sys/cam X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2016 05:10:33 -0000 Author: imp Date: Fri Apr 15 05:10:32 2016 New Revision: 298036 URL: https://svnweb.freebsd.org/changeset/base/298036 Log: Put function only used by CAM_NETFLIX_IOSCHED under that ifdef. Modified: head/sys/cam/cam_iosched.c Modified: head/sys/cam/cam_iosched.c ============================================================================== --- head/sys/cam/cam_iosched.c Fri Apr 15 05:10:31 2016 (r298035) +++ head/sys/cam/cam_iosched.c Fri Apr 15 05:10:32 2016 (r298036) @@ -625,9 +625,11 @@ cam_iosched_cl_maybe_steer(struct contro /* Periph drivers set these flags to indicate work */ #define CAM_IOSCHED_FLAG_WORK_FLAGS ((0xffffu) << 16) +#ifdef CAM_NETFLIX_IOSCHED static void cam_iosched_io_metric_update(struct cam_iosched_softc *isc, sbintime_t sim_latency, int cmd, size_t size); +#endif static inline int cam_iosched_has_flagged_work(struct cam_iosched_softc *isc) @@ -1522,6 +1524,7 @@ cam_iosched_update(struct iop_stats *iop iop->sd = (int64_t)var < 0 ? 0 : isqrt64(var); } +#ifdef CAM_NETFLIX_IOSCHED static void cam_iosched_io_metric_update(struct cam_iosched_softc *isc, sbintime_t sim_latency, int cmd, size_t size) @@ -1541,6 +1544,7 @@ cam_iosched_io_metric_update(struct cam_ break; } } +#endif #ifdef DDB static int biolen(struct bio_queue_head *bq)