svn commit: r298788 - in head/sys: fs/nfs fs/nfsclient fs/nfsserver nfs

Pedro F. Giffuni pfg at FreeBSD.org
Fri Apr 29 16:07:28 UTC 2016


Author: pfg
Date: Fri Apr 29 16:07:25 2016
New Revision: 298788
URL: https://svnweb.freebsd.org/changeset/base/298788

Log:
  NFS: spelling fixes on comments.
  
  No funcional change.

Modified:
  head/sys/fs/nfs/nfs_commonport.c
  head/sys/fs/nfs/nfsport.h
  head/sys/fs/nfs/nfsrvstate.h
  head/sys/fs/nfsclient/nfs_clbio.c
  head/sys/fs/nfsclient/nfs_clkdtrace.c
  head/sys/fs/nfsclient/nfs_clrpcops.c
  head/sys/fs/nfsclient/nfs_clstate.c
  head/sys/fs/nfsclient/nfs_clvfsops.c
  head/sys/fs/nfsclient/nfs_clvnops.c
  head/sys/fs/nfsserver/nfs_nfsdport.c
  head/sys/fs/nfsserver/nfs_nfsdstate.c
  head/sys/nfs/krpc_subr.c
  head/sys/nfs/nfs_nfssvc.c

Modified: head/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonport.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfs/nfs_commonport.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -155,7 +155,7 @@ newnfs_realign(struct mbuf **pm, int how
  *	we cannot afford to overwrite them.
  *
  *	We would prefer to avoid this situation entirely.  The situation does
- *	not occur with NFS/UDP and is supposed to only occassionally occur
+ *	not occur with NFS/UDP and is supposed to only occasionally occur
  *	with TCP.  Use vfs.nfs.realign_count and realign_test to check this.
  *
  */

Modified: head/sys/fs/nfs/nfsport.h
==============================================================================
--- head/sys/fs/nfs/nfsport.h	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfs/nfsport.h	Fri Apr 29 16:07:25 2016	(r298788)
@@ -968,7 +968,7 @@ struct nfsreq {
 
 /*
  * Name used by getnewvnode() to describe filesystem, "nfs".
- * For perfomance reasons it is useful to have the same string
+ * For performance reasons it is useful to have the same string
  * used in both places that call getnewvnode().
  */
 extern const char nfs_vnode_tag[];

Modified: head/sys/fs/nfs/nfsrvstate.h
==============================================================================
--- head/sys/fs/nfs/nfsrvstate.h	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfs/nfsrvstate.h	Fri Apr 29 16:07:25 2016	(r298788)
@@ -76,7 +76,7 @@ struct nfssessionhash {
  * Client server structure for V4. It is doubly linked into two lists.
  * The first is a hash table based on the clientid and the second is a
  * list of all clients maintained in LRU order.
- * The actual size malloc'd is large enough to accomodate the id string.
+ * The actual size malloc'd is large enough to accommodate the id string.
  */
 struct nfsclient {
 	LIST_ENTRY(nfsclient) lc_hash;		/* Clientid hash list */

Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfsclient/nfs_clbio.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -140,7 +140,7 @@ ncl_getpages(struct vop_getpages_args *a
 
 	/*
 	 * We use only the kva address for the buffer, but this is extremely
-	 * convienient and fast.
+	 * convenient and fast.
 	 */
 	bp = getpbuf(&ncl_pbuf_freecnt);
 
@@ -201,7 +201,7 @@ ncl_getpages(struct vop_getpages_args *a
 		} else {
 			/*
 			 * Read operation was short.  If no error
-			 * occured we may have hit a zero-fill
+			 * occurred we may have hit a zero-fill
 			 * section.  We leave valid set to 0, and page
 			 * is freed by vm_page_readahead_finish() if
 			 * its index is not equal to requested, or
@@ -286,7 +286,7 @@ ncl_putpages(struct vop_putpages_args *a
 
 	/*
 	 * We use only the kva address for the buffer, but this is extremely
-	 * convienient and fast.
+	 * convenient and fast.
 	 */
 	bp = getpbuf(&ncl_pbuf_freecnt);
 
@@ -1188,7 +1188,7 @@ again:
 
 		/*
 		 * Get the partial update on the progress made from
-		 * uiomove, if an error occured.
+		 * uiomove, if an error occurred.
 		 */
 		if (error != 0)
 			n = local_resid - uio->uio_resid;
@@ -1480,7 +1480,7 @@ again:
 			}
 			/*
 			 * We might have lost our iod while sleeping,
-			 * so check and loop if nescessary.
+			 * so check and loop if necessary.
 			 */
 			goto again;
 		}

Modified: head/sys/fs/nfsclient/nfs_clkdtrace.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clkdtrace.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfsclient/nfs_clkdtrace.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 
 /*
  * dtnfscl is a DTrace provider that tracks the intent to perform RPCs
- * in the NFS client, as well as acess to and maintenance of the access and
+ * in the NFS client, as well as access to and maintenance of the access and
  * attribute caches.  This is not quite the same as RPCs, because NFS may
  * issue multiple RPC transactions in the event that authentication fails,
  * there's a jukebox error, or none at all if the access or attribute cache

Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -1701,7 +1701,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *
 				commit = fxdr_unsigned(int, *tl++);
 
 				/*
-				 * Return the lowest committment level
+				 * Return the lowest commitment level
 				 * obtained by any of the RPCs.
 				 */
 				if (committed == NFSWRITE_FILESYNC)
@@ -2676,7 +2676,7 @@ nfsrpc_rmdir(vnode_t dvp, char *name, in
  * 2 - pass the opaque directory offset cookies up into userland
  *     and let the libc functions deal with them, via the system call
  * 3 - return them to userland in the "struct dirent", so future versions
- *     of libc can use them and do whatever is necessary to amke things work
+ *     of libc can use them and do whatever is necessary to make things work
  *     above these rpc calls, in the meantime
  * For now, I do #3 by "hiding" the directory offset cookies after the
  * d_name field in struct dirent. This is space inside d_reclen that
@@ -2927,7 +2927,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *u
 		if (!more_dirs)
 			tryformoredirs = 0;
 	
-		/* loop thru the dir entries, doctoring them to 4bsd form */
+		/* loop through the dir entries, doctoring them to 4bsd form */
 		while (more_dirs && bigenough) {
 			if (nd->nd_flag & ND_NFSV4) {
 				NFSM_DISSECT(tl, u_int32_t *, 3*NFSX_UNSIGNED);
@@ -3342,7 +3342,7 @@ nfsrpc_readdirplus(vnode_t vp, struct ui
 		if (!more_dirs)
 			tryformoredirs = 0;
 	
-		/* loop thru the dir entries, doctoring them to 4bsd form */
+		/* loop through the dir entries, doctoring them to 4bsd form */
 		while (more_dirs && bigenough) {
 			NFSM_DISSECT(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
 			if (nd->nd_flag & ND_NFSV4) {
@@ -5782,7 +5782,7 @@ nfsrpc_writeds(vnode_t vp, struct uio *u
 		commit = fxdr_unsigned(int, *tl++);
 
 		/*
-		 * Return the lowest committment level
+		 * Return the lowest commitment level
 		 * obtained by any of the RPCs.
 		 */
 		if (committed == NFSWRITE_FILESYNC)

Modified: head/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clstate.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfsclient/nfs_clstate.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -716,7 +716,7 @@ nfscl_openrelease(struct nfsclopen *op, 
 /*
  * Called to get a clientid structure. It will optionally lock the
  * client data structures to do the SetClientId/SetClientId_confirm,
- * but will release that lock and return the clientid with a refernce
+ * but will release that lock and return the clientid with a reference
  * count on it.
  * If the "cred" argument is NULL, a new clientid should not be created.
  * If the "p" argument is NULL, a SetClientID/SetClientIDConfirm cannot

Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -1066,7 +1066,7 @@ nfs_mount(struct mount *mp)
 
 		/*
 		 * If a change from TCP->UDP is done and there are thread(s)
-		 * that have I/O RPC(s) in progress with a tranfer size
+		 * that have I/O RPC(s) in progress with a transfer size
 		 * greater than NFS_MAXDGRAMDATA, those thread(s) will be
 		 * hung, retrying the RPC(s) forever. Usually these threads
 		 * will be seen doing an uninterruptible sleep on wait channel

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -2414,7 +2414,7 @@ nfs_sillyrename(struct vnode *dvp, struc
 
 	/* 
 	 * Fudge together a funny name.
-	 * Changing the format of the funny name to accomodate more 
+	 * Changing the format of the funny name to accommodate more 
 	 * sillynames per directory.
 	 * The name is now changed to .nfs.<ticks>.<pid>.4, where ticks is 
 	 * CPU ticks since boot.

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -1305,7 +1305,7 @@ nfsvno_fsync(struct vnode *vp, u_int64_t
 		daddr_t lblkno;
 
 		/*
-		 * Align to iosize boundry, super-align to page boundry.
+		 * Align to iosize boundary, super-align to page boundary.
 		 */
 		if (off & iomask) {
 			cnt += off & iomask;
@@ -2800,7 +2800,7 @@ nfsd_fhtovp(struct nfsrv_descript *nd, s
 	/*
 	 * Personally, I've never seen any point in requiring a
 	 * reserved port#, since only in the rare case where the
-	 * clients are all boxes with secure system priviledges,
+	 * clients are all boxes with secure system privileges,
 	 * does it provide any enhanced security, but... some people
 	 * believe it to be useful and keep putting this code back in.
 	 * (There is also some "security checker" out there that
@@ -3066,7 +3066,7 @@ out:
 }
 
 /*
- * Nfs server psuedo system call for the nfsd's
+ * Nfs server pseudo system call for the nfsd's
  */
 /*
  * MPSAFE

Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -1635,7 +1635,7 @@ tryagain:
 	    if (new_stp->ls_flags & NFSLCK_TEST) {
 		/*
 		 * RFC 3530 does not list LockT as an op that renews a
-		 * lease, but the concensus seems to be that it is ok
+		 * lease, but the consensus seems to be that it is ok
 		 * for a server to do so.
 		 */
 		error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
@@ -1742,7 +1742,7 @@ tryagain:
 	       * If the seqid part of the stateid isn't the same, return
 	       * NFSERR_OLDSTATEID for cases other than I/O Ops.
 	       * For I/O Ops, only return NFSERR_OLDSTATEID if
-	       * nfsrv_returnoldstateid is set. (The concensus on the email
+	       * nfsrv_returnoldstateid is set. (The consensus on the email
 	       * list was that most clients would prefer to not receive
 	       * NFSERR_OLDSTATEID for I/O Ops, but the RFC suggests that that
 	       * is what will happen, so I use the nfsrv_returnoldstateid to
@@ -1971,7 +1971,7 @@ tryagain:
 	 * - there is a conflict if a different client has any delegation
 	 * - there is a conflict if the same client has a read delegation
 	 *   (I don't understand why this isn't allowed, but that seems to be
-	 *    the current concensus?)
+	 *    the current consensus?)
 	 */
 	tstp = LIST_FIRST(&lfp->lf_deleg);
 	while (tstp != LIST_END(&lfp->lf_deleg)) {
@@ -2438,7 +2438,7 @@ tryagain:
 	 * For Open with other Write Access or any Deny except None
 	 * - there is a conflict if a different client has any delegation
 	 * - there is a conflict if the same client has a read delegation
-	 *   (The current concensus is that this last case should be
+	 *   (The current consensus is that this last case should be
 	 *    considered a conflict since the client with a read delegation
 	 *    could have done an Open with ReadAccess and WriteDeny
 	 *    locally and then not have checked for the WriteDeny.)
@@ -2731,7 +2731,7 @@ tryagain:
 	 * For Open with other Write Access or any Deny except None
 	 * - there is a conflict if a different client has any delegation
 	 * - there is a conflict if the same client has a read delegation
-	 *   (The current concensus is that this last case should be
+	 *   (The current consensus is that this last case should be
 	 *    considered a conflict since the client with a read delegation
 	 *    could have done an Open with ReadAccess and WriteDeny
 	 *    locally and then not have checked for the WriteDeny.)
@@ -4396,7 +4396,7 @@ tryagain:
  *   nfsrvboottime does not, somehow, get set to a previous one.
  *   (This is important so that Stale ClientIDs and StateIDs can
  *    be recognized.)
- *   The number of previous nfsvrboottime values preceeds the list.
+ *   The number of previous nfsvrboottime values precedes the list.
  * - followed by some number of appended records with:
  *   - client id string
  *   - flag that indicates it is a record revoking state via lease

Modified: head/sys/nfs/krpc_subr.c
==============================================================================
--- head/sys/nfs/krpc_subr.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/nfs/krpc_subr.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -217,7 +217,7 @@ krpc_call(struct sockaddr_in *sa, u_int 
 	from = NULL;
 
 	/*
-	 * Create socket and set its recieve timeout.
+	 * Create socket and set its receive timeout.
 	 */
 	if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0, td->td_ucred, td)))
 		return error;

Modified: head/sys/nfs/nfs_nfssvc.c
==============================================================================
--- head/sys/nfs/nfs_nfssvc.c	Fri Apr 29 15:45:22 2016	(r298787)
+++ head/sys/nfs/nfs_nfssvc.c	Fri Apr 29 16:07:25 2016	(r298788)
@@ -70,7 +70,7 @@ int (*nfsd_call_nfscl)(struct thread *, 
 int (*nfsd_call_nfsd)(struct thread *, struct nfssvc_args *) = NULL;
 
 /*
- * Nfs server psuedo system call for the nfsd's
+ * Nfs server pseudo system call for the nfsd's
  */
 int
 sys_nfssvc(struct thread *td, struct nfssvc_args *uap)


More information about the svn-src-all mailing list