From owner-svn-src-stable-10@freebsd.org Fri May 13 15:09:39 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 953ECB390D0; Fri, 13 May 2016 15:09:39 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 6F7B41038; Fri, 13 May 2016 15:09:39 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4DF9cT2087474; Fri, 13 May 2016 15:09:38 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4DF9crB087471; Fri, 13 May 2016 15:09:38 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201605131509.u4DF9crB087471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Fri, 13 May 2016 15:09:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r299677 - in stable/10/sys: cam kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2016 15:09:39 -0000 Author: pfg Date: Fri May 13 15:09:38 2016 New Revision: 299677 URL: https://svnweb.freebsd.org/changeset/base/299677 Log: MFC r298809, r298817 Minor spelling fixes. Modified: stable/10/sys/cam/cam_queue.c stable/10/sys/kern/vfs_bio.c stable/10/sys/kern/vfs_vnops.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/cam_queue.c ============================================================================== --- stable/10/sys/cam/cam_queue.c Fri May 13 14:59:02 2016 (r299676) +++ stable/10/sys/cam/cam_queue.c Fri May 13 15:09:38 2016 (r299677) @@ -122,7 +122,7 @@ camq_resize(struct camq *queue, int new_ cam_pinfo **new_array; KASSERT(new_size >= queue->entries, ("camq_resize: " - "New queue size can't accomodate queued entries (%d < %d).", + "New queue size can't accommodate queued entries (%d < %d).", new_size, queue->entries)); new_array = (cam_pinfo **)malloc(new_size * sizeof(cam_pinfo *), M_CAMQ, M_NOWAIT); Modified: stable/10/sys/kern/vfs_bio.c ============================================================================== --- stable/10/sys/kern/vfs_bio.c Fri May 13 14:59:02 2016 (r299676) +++ stable/10/sys/kern/vfs_bio.c Fri May 13 15:09:38 2016 (r299677) @@ -210,7 +210,7 @@ SYSCTL_INT(_vfs, OID_AUTO, getnewbufcall "Number of calls to getnewbuf"); static int getnewbufrestarts; SYSCTL_INT(_vfs, OID_AUTO, getnewbufrestarts, CTLFLAG_RW, &getnewbufrestarts, 0, - "Number of times getnewbuf has had to restart a buffer aquisition"); + "Number of times getnewbuf has had to restart a buffer acquisition"); static int mappingrestarts; SYSCTL_INT(_vfs, OID_AUTO, mappingrestarts, CTLFLAG_RW, &mappingrestarts, 0, "Number of times getblk has had to restart a buffer mapping for " @@ -738,7 +738,7 @@ kern_vfs_bio_buffer_alloc(caddr_t v, lon else bio_transient_maxcnt = biotmap_sz / MAXPHYS; /* - * Artifically limit to 1024 simultaneous in-flight I/Os + * Artificially limit to 1024 simultaneous in-flight I/Os * using the transient mapping. */ if (bio_transient_maxcnt > 1024) @@ -3088,7 +3088,7 @@ has_addr: * to clear B_INVAL. If the caller does this without issuing an I/O, * the caller should set B_CACHE ( as an optimization ), else the caller * should issue the I/O and biodone() will set B_CACHE if the I/O was - * a write attempt or if it was a successfull read. If the caller + * a write attempt or if it was a successful read. If the caller * intends to issue a READ, the caller must clear B_INVAL and BIO_ERROR * prior to issuing the READ. biodone() will *not* clear B_INVAL. */ @@ -3200,7 +3200,7 @@ loop: bp_unmapped_get_kva(bp, blkno, size, flags); /* - * If the size is inconsistant in the VMIO case, we can resize + * If the size is inconsistent in the VMIO case, we can resize * the buffer. This might lead to B_CACHE getting set or * cleared. If the size has not changed, B_CACHE remains * unchanged from its previous state. @@ -3369,7 +3369,7 @@ geteblk(int size, int flags) * resize a buffer up or down. * * Note that this code is tricky, and has many complications to resolve - * deadlock or inconsistant data situations. Tread lightly!!! + * deadlock or inconsistent data situations. Tread lightly!!! * There are B_CACHE and B_DELWRI interactions that must be dealt with by * the caller. Calling this code willy nilly can result in the loss of data. * @@ -3799,11 +3799,11 @@ dev_strategy_csw(struct cdev *dev, struc * assuming B_INVAL is clear. * * For the VMIO case, we set B_CACHE if the op was a read and no - * read error occured, or if the op was a write. B_CACHE is never + * read error occurred, or if the op was a write. B_CACHE is never * set if the buffer is invalid or otherwise uncacheable. * * biodone does not mess with B_INVAL, allowing the I/O routine or the - * initiator to leave B_INVAL set to brelse the buffer out of existance + * initiator to leave B_INVAL set to brelse the buffer out of existence * in the biodone routine. */ void @@ -3869,7 +3869,7 @@ bufdone_finish(struct buf *bp) /* * Set B_CACHE if the op was a normal read and no error - * occured. B_CACHE is set for writes in the b*write() + * occurred. B_CACHE is set for writes in the b*write() * routines. */ iosize = bp->b_bcount - bp->b_resid; @@ -3947,7 +3947,7 @@ bufdone_finish(struct buf *bp) /* * This routine is called in lieu of iodone in the case of * incomplete I/O. This keeps the busy status for pages - * consistant. + * consistent. */ void vfs_unbusy_pages(struct buf *bp) @@ -4027,7 +4027,7 @@ vfs_page_set_validclean(struct buf *bp, /* * Start and end offsets in buffer. eoff - soff may not cross a - * page boundry or cross the end of the buffer. The end of the + * page boundary or cross the end of the buffer. The end of the * buffer, in this case, is our file EOF, not the allocation size * of the buffer. */ @@ -4084,10 +4084,10 @@ vfs_drain_busy_pages(struct buf *bp) * progress, and treat the pages associated with the buffer * almost as being exclusive busy. Also the object paging_in_progress * flag is handled to make sure that the object doesn't become - * inconsistant. + * inconsistent. * * Since I/O has not been initiated yet, certain buffer flags - * such as BIO_ERROR or B_INVAL may be in an inconsistant state + * such as BIO_ERROR or B_INVAL may be in an inconsistent state * and should be ignored. */ void Modified: stable/10/sys/kern/vfs_vnops.c ============================================================================== --- stable/10/sys/kern/vfs_vnops.c Fri May 13 14:59:02 2016 (r299676) +++ stable/10/sys/kern/vfs_vnops.c Fri May 13 15:09:38 2016 (r299677) @@ -1595,7 +1595,7 @@ _vn_lock(struct vnode *vp, int flags, ch error = VOP_LOCK1(vp, flags, file, line); flags &= ~LK_INTERLOCK; /* Interlock is always dropped. */ KASSERT((flags & LK_RETRY) == 0 || error == 0, - ("LK_RETRY set with incompatible flags (0x%x) or an error occured (%d)", + ("LK_RETRY set with incompatible flags (0x%x) or an error occurred (%d)", flags, error)); /* * Callers specify LK_RETRY if they wish to get dead vnodes.