From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 08:17:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25FDF221; Sun, 23 Nov 2014 08:17:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 1258F7A2; Sun, 23 Nov 2014 08:17:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAN8HlPW017007; Sun, 23 Nov 2014 08:17:47 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAN8Hlbu017004; Sun, 23 Nov 2014 08:17:47 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411230817.sAN8Hlbu017004@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 23 Nov 2014 08:17:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274910 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 08:17:48 -0000 Author: glebius Date: Sun Nov 23 08:17:46 2014 New Revision: 274910 URL: https://svnweb.freebsd.org/changeset/base/274910 Log: Various style(9) changes. Submitted by: kib Modified: projects/sendfile/sys/vm/swap_pager.c projects/sendfile/sys/vm/vm_pager.h projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/swap_pager.c ============================================================================== --- projects/sendfile/sys/vm/swap_pager.c Sun Nov 23 04:17:39 2014 (r274909) +++ projects/sendfile/sys/vm/swap_pager.c Sun Nov 23 08:17:46 2014 (r274910) @@ -1284,7 +1284,7 @@ swap_pager_getpages_async(vm_object_t ob error = EINVAL; break; default: - error = EDOOFUS; + panic("unhandled swap_pager_getpages() error %d\n", r); } (iodone)(arg, m, count, error); VM_OBJECT_WLOCK(object); Modified: projects/sendfile/sys/vm/vm_pager.h ============================================================================== --- projects/sendfile/sys/vm/vm_pager.h Sun Nov 23 04:17:39 2014 (r274909) +++ projects/sendfile/sys/vm/vm_pager.h Sun Nov 23 08:17:46 2014 (r274910) @@ -143,12 +143,10 @@ static inline int vm_pager_get_pages_async(vm_object_t object, vm_page_t *m, int count, int reqpage, pgo_getpages_iodone_t iodone, void *arg) { - int r; VM_OBJECT_ASSERT_WLOCKED(object); - r = (*pagertab[object->type]->pgo_getpages_async)(object, m, count, - reqpage, iodone, arg); - return (r); + return ((*pagertab[object->type]->pgo_getpages_async)(object, m, + count, reqpage, iodone, arg)); } static __inline void Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Sun Nov 23 04:17:39 2014 (r274909) +++ projects/sendfile/sys/vm/vnode_pager.c Sun Nov 23 08:17:46 2014 (r274910) @@ -675,17 +675,17 @@ static int vnode_pager_getpages_async(vm_object_t object, vm_page_t *m, int count, int reqpage, vop_getpages_iodone_t iodone, void *arg) { - int rtval; struct vnode *vp; - int bytes = count * PAGE_SIZE; + int rtval; vp = object->handle; VM_OBJECT_WUNLOCK(object); - rtval = VOP_GETPAGES_ASYNC(vp, m, bytes, reqpage, 0, iodone, arg); + rtval = VOP_GETPAGES_ASYNC(vp, m, count * PAGE_SIZE, reqpage, 0, + iodone, arg); KASSERT(rtval != EOPNOTSUPP, ("vnode_pager: FS getpages_async not implemented\n")); VM_OBJECT_WLOCK(object); - return rtval; + return (rtval); } /* @@ -981,7 +981,7 @@ vnode_pager_generic_getpages(struct vnod /* do the input */ bp->b_iooffset = dbtob(bp->b_blkno); - if (iodone) { /* async */ + if (iodone != NULL) { /* async */ bp->b_pager.pg_iodone = iodone; bp->b_caller1 = arg; bp->b_iodone = vnode_pager_generic_getpages_done_async; @@ -1022,14 +1022,12 @@ vnode_pager_generic_getpages_done_async( static int vnode_pager_generic_getpages_done(struct buf *bp) { - vm_object_t object = bp->b_vp->v_object; + vm_object_t object; off_t tfoff, nextoff; int i, error; - if ((bp->b_ioflags & BIO_ERROR) != 0) - error = EIO; - else - error = 0; + error = (bp->b_ioflags & BIO_ERROR) != 0 ? EIO : 0; + object = bp->b_vp->v_object; if (error == 0 && bp->b_bcount != bp->b_npages * PAGE_SIZE) { if ((bp->b_flags & B_UNMAPPED) != 0) { @@ -1084,7 +1082,7 @@ vnode_pager_generic_getpages_done(struct vm_page_readahead_finish(mt); } VM_OBJECT_WUNLOCK(object); - if (error) + if (error != 0) printf("%s: I/O read error %d\n", __func__, error); return (error);