From owner-svn-src-stable@FreeBSD.ORG Wed Jul 3 23:59:09 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BBA04CEE; Wed, 3 Jul 2013 23:59:09 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 82F5B1F85; Wed, 3 Jul 2013 23:59:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63Nx959069983; Wed, 3 Jul 2013 23:59:09 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63Nx8Pi069980; Wed, 3 Jul 2013 23:59:08 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201307032359.r63Nx8Pi069980@svn.freebsd.org> From: Jim Harris Date: Wed, 3 Jul 2013 23:59:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r252666 - stable/9/sys/dev/nvme X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2013 23:59:09 -0000 Author: jimharris Date: Wed Jul 3 23:59:08 2013 New Revision: 252666 URL: http://svnweb.freebsd.org/changeset/base/252666 Log: MFC r252273: Remove remaining uio-related code. The nvme_physio() function was removed quite a while ago, which was the only user of this uio-related code. Sponsored by: Intel Modified: stable/9/sys/dev/nvme/nvme_private.h stable/9/sys/dev/nvme/nvme_qpair.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/nvme/nvme_private.h ============================================================================== --- stable/9/sys/dev/nvme/nvme_private.h Wed Jul 3 23:58:09 2013 (r252665) +++ stable/9/sys/dev/nvme/nvme_private.h Wed Jul 3 23:59:08 2013 (r252666) @@ -145,7 +145,6 @@ struct nvme_request { struct nvme_qpair *qpair; union { void *payload; - struct uio *uio; struct bio *bio; } u; uint32_t type; @@ -469,8 +468,6 @@ int nvme_ns_construct(struct nvme_namesp struct nvme_controller *ctrlr); void nvme_ns_destruct(struct nvme_namespace *ns); -int nvme_ns_physio(struct cdev *dev, struct uio *uio, int ioflag); - void nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr); void nvme_dump_command(struct nvme_command *cmd); @@ -525,19 +522,6 @@ nvme_allocate_request_null(nvme_cb_fn_t } static __inline struct nvme_request * -nvme_allocate_request_uio(struct uio *uio, nvme_cb_fn_t cb_fn, void *cb_arg) -{ - struct nvme_request *req; - - req = _nvme_allocate_request(cb_fn, cb_arg); - if (req != NULL) { - req->type = NVME_REQUEST_UIO; - req->u.uio = uio; - } - return (req); -} - -static __inline struct nvme_request * nvme_allocate_request_bio(struct bio *bio, nvme_cb_fn_t cb_fn, void *cb_arg) { struct nvme_request *req; Modified: stable/9/sys/dev/nvme/nvme_qpair.c ============================================================================== --- stable/9/sys/dev/nvme/nvme_qpair.c Wed Jul 3 23:58:09 2013 (r252665) +++ stable/9/sys/dev/nvme/nvme_qpair.c Wed Jul 3 23:59:08 2013 (r252666) @@ -735,14 +735,6 @@ nvme_payload_map(void *arg, bus_dma_segm } static void -nvme_payload_map_uio(void *arg, bus_dma_segment_t *seg, int nseg, - bus_size_t mapsize, int error) -{ - - nvme_payload_map(arg, seg, nseg, error); -} - -static void _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req) { struct nvme_tracker *tr; @@ -798,14 +790,6 @@ _nvme_qpair_submit_request(struct nvme_q case NVME_REQUEST_NULL: nvme_qpair_submit_tracker(tr->qpair, tr); break; - case NVME_REQUEST_UIO: - err = bus_dmamap_load_uio(tr->qpair->dma_tag, - tr->payload_dma_map, req->u.uio, nvme_payload_map_uio, - tr, 0); - if (err != 0) - nvme_printf(qpair->ctrlr, - "bus_dmamap_load_uio returned 0x%x!\n", err); - break; #ifdef NVME_UNMAPPED_BIO_SUPPORT case NVME_REQUEST_BIO: KASSERT(req->u.bio->bio_bcount <= qpair->ctrlr->max_xfer_size,