From owner-svn-src-all@freebsd.org Fri Apr 22 16:20:59 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 ACAF9B1962B; Fri, 22 Apr 2016 16:20:59 +0000 (UTC) (envelope-from allanjude@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 7D8501DF8; Fri, 22 Apr 2016 16:20:59 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3MGKwnv088585; Fri, 22 Apr 2016 16:20:58 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3MGKwB6088584; Fri, 22 Apr 2016 16:20:58 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201604221620.u3MGKwB6088584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Fri, 22 Apr 2016 16:20:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298478 - head/sys/boot/pc98/libpc98 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, 22 Apr 2016 16:20:59 -0000 Author: allanjude Date: Fri Apr 22 16:20:58 2016 New Revision: 298478 URL: https://svnweb.freebsd.org/changeset/base/298478 Log: Fix more pc98 build issues re: bcache change Reported by: bz, emaste Modified: head/sys/boot/pc98/libpc98/biosdisk.c Modified: head/sys/boot/pc98/libpc98/biosdisk.c ============================================================================== --- head/sys/boot/pc98/libpc98/biosdisk.c Fri Apr 22 16:15:58 2016 (r298477) +++ head/sys/boot/pc98/libpc98/biosdisk.c Fri Apr 22 16:20:58 2016 (r298478) @@ -737,13 +737,13 @@ bd_strategy(void *devdata, int rw, daddr char *buf, size_t *rsize) { struct bcache_devdata bcd; - struct i386_devdesc *dev = f->f_devdata; + struct i386_devdesc *dev = devdata; struct open_disk *od = (struct open_disk *)(dev->d_kind.biosdisk.data); bcd.dv_strategy = bd_realstrategy; bcd.dv_devdata = devdata; bcd.dv_cache = BD(dev).bd_bcache; - return(bcache_strategy(&bcd, od->od_unit, rw, dblk+od->od_boff, offset, + return(bcache_strategy(&bcd, rw, dblk+od->od_boff, offset, size, buf, rsize)); }