From owner-svn-src-stable@FreeBSD.ORG Sat May 14 00:39:47 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 5738B106564A; Sat, 14 May 2011 00:39:47 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4563C8FC15; Sat, 14 May 2011 00:39:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4E0dlhV087012; Sat, 14 May 2011 00:39:47 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4E0dlWa087005; Sat, 14 May 2011 00:39:47 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201105140039.p4E0dlWa087005@svn.freebsd.org> From: Alexander Motin Date: Sat, 14 May 2011 00:39:47 +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: r221865 - in stable/8/sys/dev: ahci mvs siis 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: Sat, 14 May 2011 00:39:47 -0000 Author: mav Date: Sat May 14 00:39:46 2011 New Revision: 221865 URL: http://svn.freebsd.org/changeset/base/221865 Log: MFC r220830: Fix some English grammar. Modified: stable/8/sys/dev/ahci/ahci.c stable/8/sys/dev/ahci/ahci.h stable/8/sys/dev/mvs/mvs.c stable/8/sys/dev/mvs/mvs.h stable/8/sys/dev/siis/siis.c stable/8/sys/dev/siis/siis.h 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/ahci/ahci.c ============================================================================== --- stable/8/sys/dev/ahci/ahci.c Sat May 14 00:35:56 2011 (r221864) +++ stable/8/sys/dev/ahci/ahci.c Sat May 14 00:39:46 2011 (r221865) @@ -2127,16 +2127,16 @@ ahci_issue_recovery(device_t dev) struct ccb_scsiio *csio; int i; - /* Find some holden command. */ + /* Find some held command. */ for (i = 0; i < ch->numslots; i++) { if (ch->hold[i]) break; } ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { - device_printf(dev, "Unable allocate recovery command\n"); + device_printf(dev, "Unable to allocate recovery command\n"); completeall: - /* We can't do anything -- complete holden commands. */ + /* We can't do anything -- complete held commands. */ for (i = 0; i < ch->numslots; i++) { if (ch->hold[i] == NULL) continue; @@ -2161,7 +2161,7 @@ completeall: if (ataio->data_ptr == NULL) { xpt_free_ccb(ccb); device_printf(dev, - "Unable allocate memory for READ LOG command\n"); + "Unable to allocate memory for READ LOG command\n"); goto completeall; } ataio->dxfer_len = 512; Modified: stable/8/sys/dev/ahci/ahci.h ============================================================================== --- stable/8/sys/dev/ahci/ahci.h Sat May 14 00:35:56 2011 (r221864) +++ stable/8/sys/dev/ahci/ahci.h Sat May 14 00:39:46 2011 (r221865) @@ -408,7 +408,7 @@ struct ahci_channel { int numrslotspd[16];/* Number of running slots per dev */ int numtslots; /* Number of tagged slots */ int numtslotspd[16];/* Number of tagged slots per dev */ - int numhslots; /* Number of holden slots */ + int numhslots; /* Number of held slots */ int recoverycmd; /* Our READ LOG active */ int fatalerr; /* Fatal error happend */ int lastslot; /* Last used slot */ Modified: stable/8/sys/dev/mvs/mvs.c ============================================================================== --- stable/8/sys/dev/mvs/mvs.c Sat May 14 00:35:56 2011 (r221864) +++ stable/8/sys/dev/mvs/mvs.c Sat May 14 00:39:46 2011 (r221865) @@ -1780,16 +1780,16 @@ mvs_issue_recovery(device_t dev) struct ccb_scsiio *csio; int i; - /* Find some holden command. */ + /* Find some held command. */ for (i = 0; i < MVS_MAX_SLOTS; i++) { if (ch->hold[i]) break; } ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { - device_printf(dev, "Unable allocate recovery command\n"); + device_printf(dev, "Unable to allocate recovery command\n"); completeall: - /* We can't do anything -- complete holden commands. */ + /* We can't do anything -- complete held commands. */ for (i = 0; i < MVS_MAX_SLOTS; i++) { if (ch->hold[i] == NULL) continue; @@ -1814,7 +1814,7 @@ completeall: if (ataio->data_ptr == NULL) { xpt_free_ccb(ccb); device_printf(dev, - "Unable allocate memory for READ LOG command\n"); + "Unable to allocate memory for READ LOG command\n"); goto completeall; } ataio->dxfer_len = 512; Modified: stable/8/sys/dev/mvs/mvs.h ============================================================================== --- stable/8/sys/dev/mvs/mvs.h Sat May 14 00:35:56 2011 (r221864) +++ stable/8/sys/dev/mvs/mvs.h Sat May 14 00:39:46 2011 (r221865) @@ -538,7 +538,7 @@ struct mvs_channel { struct mvs_slot slot[MVS_MAX_SLOTS]; union ccb *hold[MVS_MAX_SLOTS]; - int holdtag[MVS_MAX_SLOTS]; /* Tags used for holden commands. */ + int holdtag[MVS_MAX_SLOTS]; /* Tags used for held commands. */ struct mtx mtx; /* state lock */ int devices; /* What is present */ int pm_present; /* PM presence reported */ @@ -556,7 +556,7 @@ struct mvs_channel { int numdslots; /* Number of DMA slots */ int numtslots; /* Number of NCQ slots */ int numtslotspd[16];/* Number of NCQ slots per dev */ - int numhslots; /* Number of holden slots */ + int numhslots; /* Number of held slots */ int recoverycmd; /* Our READ LOG active */ int fatalerr; /* Fatal error happend */ int lastslot; /* Last used slot */ Modified: stable/8/sys/dev/siis/siis.c ============================================================================== --- stable/8/sys/dev/siis/siis.c Sat May 14 00:35:56 2011 (r221864) +++ stable/8/sys/dev/siis/siis.c Sat May 14 00:39:46 2011 (r221865) @@ -1366,7 +1366,7 @@ siis_issue_recovery(device_t dev) struct ccb_scsiio *csio; int i; - /* Find some holden command. */ + /* Find some held command. */ for (i = 0; i < SIIS_MAX_SLOTS; i++) { if (ch->hold[i]) break; @@ -1375,9 +1375,9 @@ siis_issue_recovery(device_t dev) return; ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { - device_printf(dev, "Unable allocate recovery command\n"); + device_printf(dev, "Unable to allocate recovery command\n"); completeall: - /* We can't do anything -- complete holden commands. */ + /* We can't do anything -- complete held commands. */ for (i = 0; i < SIIS_MAX_SLOTS; i++) { if (ch->hold[i] == NULL) continue; @@ -1402,7 +1402,7 @@ completeall: if (ataio->data_ptr == NULL) { xpt_free_ccb(ccb); device_printf(dev, - "Unable allocate memory for READ LOG command\n"); + "Unable to allocate memory for READ LOG command\n"); goto completeall; } ataio->dxfer_len = 512; @@ -1601,7 +1601,7 @@ siis_reset(device_t dev) /* XXX; Commands in loading state. */ siis_end_transaction(&ch->slot[i], SIIS_ERR_INNOCENT); } - /* Finish all holden commands as-is. */ + /* Finish all held commands as-is. */ for (i = 0; i < SIIS_MAX_SLOTS; i++) { if (!ch->hold[i]) continue; Modified: stable/8/sys/dev/siis/siis.h ============================================================================== --- stable/8/sys/dev/siis/siis.h Sat May 14 00:35:56 2011 (r221864) +++ stable/8/sys/dev/siis/siis.h Sat May 14 00:39:46 2011 (r221865) @@ -387,7 +387,7 @@ struct siis_channel { uint32_t toslots; /* Slots in timeout */ int numrslots; /* Number of running slots */ int numtslots[SIIS_MAX_SLOTS]; /* Number of tagged slots */ - int numhslots; /* Number of holden slots */ + int numhslots; /* Number of held slots */ int recoverycmd; /* Our READ LOG active */ int fatalerr; /* Fatal error happend */ int recovery; /* Some slots are in error */