From owner-svn-src-stable@FreeBSD.ORG Thu May 30 17:17:23 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4F965B8D; Thu, 30 May 2013 17:17:23 +0000 (UTC) (envelope-from scottl@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 27C287AF; Thu, 30 May 2013 17:17:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4UHHNEc075333; Thu, 30 May 2013 17:17:23 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4UHHMub075329; Thu, 30 May 2013 17:17:22 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201305301717.r4UHHMub075329@svn.freebsd.org> From: Scott Long Date: Thu, 30 May 2013 17:17:22 +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: r251145 - in stable/9/sys: kern sys 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: Thu, 30 May 2013 17:17:23 -0000 Author: scottl Date: Thu May 30 17:17:22 2013 New Revision: 251145 URL: http://svnweb.freebsd.org/changeset/base/251145 Log: MFC r248504: Add a convenience macro bread_gb() to wrap a call to breadn_flags(). Comparing with bread(), it adds an argument to pass the flags to getblk(). The API implementation of bread() and friends is different in FreeBSD 9, so this merge is a little more complicated than the original commit. Submitted by: kib, FF Obtained from: Netflix Modified: stable/9/sys/kern/vfs_bio.c stable/9/sys/sys/buf.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/sys/kern/vfs_bio.c ============================================================================== --- stable/9/sys/kern/vfs_bio.c Thu May 30 16:51:48 2013 (r251144) +++ stable/9/sys/kern/vfs_bio.c Thu May 30 17:17:22 2013 (r251145) @@ -833,6 +833,18 @@ breada(struct vnode * vp, daddr_t * rabl } /* + * Operates like bread, but with getblk flags. + */ +int +bread_gb(struct vnode * vp, daddr_t blkno, int cnt, struct ucred * cred, + int gbflags, struct buf **bpp) +{ + + return (breadn_flags(vp, blkno, cnt, NULL, NULL, 0, + cred, gbflags, bpp)); +} + +/* * Operates like bread, but also starts asynchronous I/O on * read-ahead blocks. */ Modified: stable/9/sys/sys/buf.h ============================================================================== --- stable/9/sys/sys/buf.h Thu May 30 16:51:48 2013 (r251144) +++ stable/9/sys/sys/buf.h Thu May 30 17:17:22 2013 (r251145) @@ -484,6 +484,8 @@ int buf_dirty_count_severe(void); void bremfree(struct buf *); void bremfreef(struct buf *); /* XXX Force bremfree, only for nfs. */ int bread(struct vnode *, daddr_t, int, struct ucred *, struct buf **); +int bread_gb(struct vnode *, daddr_t, int, struct ucred *, + int gbflags, struct buf **); void breada(struct vnode *, daddr_t *, int *, int, struct ucred *); int breadn(struct vnode *, daddr_t, int, daddr_t *, int *, int, struct ucred *, struct buf **);