From owner-svn-src-stable@freebsd.org Tue Aug 13 19:17:44 2019 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4E38B971B; Tue, 13 Aug 2019 19:17:44 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 467MtJ5Wdwz4GLc; Tue, 13 Aug 2019 19:17:44 +0000 (UTC) (envelope-from mav@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F1A81C2C9; Tue, 13 Aug 2019 19:17:44 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7DJHiBW048233; Tue, 13 Aug 2019 19:17:44 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7DJHipR048232; Tue, 13 Aug 2019 19:17:44 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201908131917.x7DJHipR048232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 13 Aug 2019 19:17:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r350995 - stable/12/sys/dev/nvd X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/12/sys/dev/nvd X-SVN-Commit-Revision: 350995 X-SVN-Commit-Repository: base 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.29 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: Tue, 13 Aug 2019 19:17:45 -0000 Author: mav Date: Tue Aug 13 19:17:44 2019 New Revision: 350995 URL: https://svnweb.freebsd.org/changeset/base/350995 Log: MFC r350961: Missed part of r350523. Modified: stable/12/sys/dev/nvd/nvd.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/nvd/nvd.c ============================================================================== --- stable/12/sys/dev/nvd/nvd.c Tue Aug 13 16:25:23 2019 (r350994) +++ stable/12/sys/dev/nvd/nvd.c Tue Aug 13 19:17:44 2019 (r350995) @@ -277,17 +277,12 @@ nvd_gonecb(struct disk *dp) } static int -nvd_ioctl(struct disk *ndisk, u_long cmd, void *data, int fflag, +nvd_ioctl(struct disk *dp, u_long cmd, void *data, int fflag, struct thread *td) { - int ret = 0; + struct nvd_disk *ndisk = dp->d_drv1; - switch (cmd) { - default: - ret = EIO; - } - - return (ret); + return (nvme_ns_ioctl_process(ndisk->ns, cmd, data, fflag, td)); } static int