From owner-svn-src-all@freebsd.org Sun Nov 22 09:48:05 2015 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 32E8CA35CBE; Sun, 22 Nov 2015 09:48:05 +0000 (UTC) (envelope-from kib@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 E92FE1E0D; Sun, 22 Nov 2015 09:48:04 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAM9m4po048511; Sun, 22 Nov 2015 09:48:04 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAM9m4Iw048510; Sun, 22 Nov 2015 09:48:04 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201511220948.tAM9m4Iw048510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 22 Nov 2015 09:48:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291157 - head/sys/vm 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.20 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: Sun, 22 Nov 2015 09:48:05 -0000 Author: kib Date: Sun Nov 22 09:48:03 2015 New Revision: 291157 URL: https://svnweb.freebsd.org/changeset/base/291157 Log: Noted by: glebius Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/vm/vnode_pager.c Modified: head/sys/vm/vnode_pager.c ============================================================================== --- head/sys/vm/vnode_pager.c Sun Nov 22 05:26:13 2015 (r291156) +++ head/sys/vm/vnode_pager.c Sun Nov 22 09:48:03 2015 (r291157) @@ -770,7 +770,7 @@ vnode_pager_generic_getpages(struct vnod struct bufobj *bo; struct buf *bp; daddr_t firstaddr, reqblock; - off_t foff; + off_t foff, pib; int pbefore, pafter, i, size, bsize, first, last, *freecnt; int count, error, before, after, secmask; @@ -864,8 +864,9 @@ vnode_pager_generic_getpages(struct vnod VM_OBJECT_WUNLOCK(object); } - pbefore = (daddr_t)before * bsize / PAGE_SIZE; - pafter = (daddr_t)after * bsize / PAGE_SIZE; + pib = IDX_TO_OFF(m[reqpage]->pindex) % bsize; + pbefore = ((daddr_t)before * bsize + pib) / PAGE_SIZE; + pafter = ((daddr_t)(after + 1) * bsize - pib) / PAGE_SIZE - 1; first = reqpage < pbefore ? 0 : reqpage - pbefore; last = reqpage + pafter >= count ? count - 1 : reqpage + pafter; if (first > 0 || last + 1 < count) { @@ -887,7 +888,7 @@ vnode_pager_generic_getpages(struct vnod * here on direct device I/O */ firstaddr = reqblock; - firstaddr += (IDX_TO_OFF(m[reqpage]->pindex) % bsize) / DEV_BSIZE; + firstaddr += pib / DEV_BSIZE; firstaddr -= IDX_TO_OFF(reqpage - first) / DEV_BSIZE; /*