From owner-svn-src-projects@FreeBSD.ORG Fri Feb 4 01:20:24 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DDD31065673; Fri, 4 Feb 2011 01:20:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0BBC48FC0A; Fri, 4 Feb 2011 01:20:24 +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 p141KNoh064742; Fri, 4 Feb 2011 01:20:23 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p141KNXl064740; Fri, 4 Feb 2011 01:20:23 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201102040120.p141KNXl064740@svn.freebsd.org> From: Warner Losh Date: Fri, 4 Feb 2011 01:20:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218247 - projects/graid/head/sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 04 Feb 2011 01:20:24 -0000 Author: imp Date: Fri Feb 4 01:20:23 2011 New Revision: 218247 URL: http://svn.freebsd.org/changeset/base/218247 Log: Minor formatting nits Modified: projects/graid/head/sys/geom/raid/tr_raid1.c Modified: projects/graid/head/sys/geom/raid/tr_raid1.c ============================================================================== --- projects/graid/head/sys/geom/raid/tr_raid1.c Fri Feb 4 01:09:02 2011 (r218246) +++ projects/graid/head/sys/geom/raid/tr_raid1.c Fri Feb 4 01:20:23 2011 (r218247) @@ -609,10 +609,11 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_ cbp = g_clone_bio(pbp); if (cbp == NULL) { /* - * By flagging that we're not doing anything, - * we'll pick up the rebuild at a later point - * either by timeout or when we steal a small - * part of the active I/O. + * By flagging that we're not doing + * anything, we'll pick up the rebuild + * at a later point either by timeout + * or when we steal a small part of + * the active I/O. */ g_destroy_bio(bp); /* reuse? */ trs->trso_flags &= ~TR_RAID1_F_DOING_SOME; @@ -671,10 +672,11 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_ cbp = g_clone_bio(pbp); if (cbp == NULL) { /* - * By flagging that we're not doing anything, - * we'll pick up the rebuild at a later point - * either by timeout or when we steal a small - * part of the active I/O. + * By flagging that we're not doing + * anything, we'll pick up the rebuild + * at a later point either by timeout + * or when we steal a small part of + * the active I/O. */ trs->trso_flags &= ~TR_RAID1_F_DOING_SOME; return; @@ -692,10 +694,9 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_ } } else if (trs->trso_type == TR_RAID1_RESYNC) { /* - * read good sd, read bad sd in parallel. - * when both done, compare the buffers. write - * good to the failed if different. do the - * next bit of work. + * read good sd, read bad sd in parallel. when both + * done, compare the buffers. write good to the bad + * if different. do the next bit of work. */ panic("Somehow, we think we're doing a resync"); } @@ -720,9 +721,8 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_ * everything to get it back in sync), or just degrade the * drive, which kicks off a resync? */ - if (sd->sd_read_errs > SD_READ_THRESHOLD) { + if (sd->sd_read_errs > SD_READ_THRESHOLD) g_raid_fail_disk(sd->sd_softc, sd, sd->sd_disk); - } /* * Find the other disk, and try to do the I/O to it. @@ -780,11 +780,11 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_ /* * We're done with a remap write, mark the range as unlocked. * For any write errors, we agressively fail the disk since - * there was both a READ and a WRITE error at this location. Both - * types of errors generally indicates the drive is on the verge of - * total failure anyway. Better to stop trusting it now. However, - * we need to reset error to 0 in that case because we're not failing - * the original I/O which succeeded. + * there was both a READ and a WRITE error at this location. + * Both types of errors generally indicates the drive is on + * the verge of total failure anyway. Better to stop trusting + * it now. However, we need to reset error to 0 in that case + * because we're not failing the original I/O which succeeded. */ G_RAID_LOGREQ(2, bp, "REMAP done %d.", bp->bio_error); g_raid_unlock_range(sd->sd_volume, bp->bio_offset,