From owner-svn-src-stable@FreeBSD.ORG Fri Mar 18 08:52:26 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FEFA1065670; Fri, 18 Mar 2011 08:52:26 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 64AF58FC0C; Fri, 18 Mar 2011 08:52:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2I8qQSP054354; Fri, 18 Mar 2011 08:52:26 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2I8qQWe054352; Fri, 18 Mar 2011 08:52:26 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201103180852.p2I8qQWe054352@svn.freebsd.org> From: Jaakko Heinonen Date: Fri, 18 Mar 2011 08:52:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219729 - stable/8/sys/dev/md X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 18 Mar 2011 08:52:26 -0000 Author: jh Date: Fri Mar 18 08:52:26 2011 New Revision: 219729 URL: http://svn.freebsd.org/changeset/base/219729 Log: MFC r210496: - Remove some extra white space. - Wrap g_md_dumpconf() prototype to 80 columns. Modified: stable/8/sys/dev/md/md.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/md/md.c ============================================================================== --- stable/8/sys/dev/md/md.c Fri Mar 18 08:48:06 2011 (r219728) +++ stable/8/sys/dev/md/md.c Fri Mar 18 08:52:26 2011 (r219729) @@ -126,10 +126,10 @@ static g_init_t g_md_init; static g_fini_t g_md_fini; static g_start_t g_md_start; static g_access_t g_md_access; -static void g_md_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, - struct g_consumer *cp __unused, struct g_provider *pp); +static void g_md_dumpconf(struct sbuf *sb, const char *indent, + struct g_geom *gp, struct g_consumer *cp __unused, struct g_provider *pp); -static int mdunits; +static int mdunits; static struct cdev *status_dev = 0; static struct sx md_sx; static struct unrhdr *md_uh; @@ -683,7 +683,7 @@ mdstart_swap(struct md_s *sc, struct bio #if 0 if (bootverbose || bp->bio_offset / PAGE_SIZE < 17) printf("wire_count %d busy %d flags %x hold_count %d act_count %d queue %d valid %d dirty %d @ %d\n", - m->wire_count, m->busy, + m->wire_count, m->busy, m->flags, m->hold_count, m->act_count, m->queue, m->valid, m->dirty, i); #endif } @@ -793,7 +793,6 @@ mdnew(int unit, int *errp, enum md_types static void mdinit(struct md_s *sc) { - struct g_geom *gp; struct g_provider *pp; @@ -941,7 +940,7 @@ mdcreate_vnode(struct md_s *sc, struct m if (nd.ni_vp->v_type != VREG) { error = EINVAL; goto bad; - } + } error = VOP_GETATTR(nd.ni_vp, &vattr, td->td_ucred); if (error != 0) goto bad; @@ -1196,7 +1195,7 @@ xmdctlioctl(struct cdev *dev, u_long cmd static int mdctlioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td) { - int error; + int error; sx_xlock(&md_sx); error = xmdctlioctl(dev, cmd, addr, flags, td); @@ -1228,7 +1227,6 @@ md_preloaded(u_char *image, size_t lengt static void g_md_init(struct g_class *mp __unused) { - caddr_t mod; caddr_t c; u_char *ptr, *name, *type; @@ -1274,7 +1272,7 @@ g_md_init(struct g_class *mp __unused) } static void -g_md_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, +g_md_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_consumer *cp __unused, struct g_provider *pp) { struct md_s *mp;