7684 RFC 3530 is obsolete

Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

4 files changed, 35 insertions, 23 deletions

diff --git a/usr/src/lib/libmapid/common/mapid.c b/usr/src/lib/libmapid/common/mapid.c
index 1895c72fed..d0a006d6be 100644
--- a/usr/src/lib/libmapid/common/mapid.c
+++ b/usr/src/lib/libmapid/common/mapid.c
@@ -25,7 +25,7 @@
 /*
  * PSARC/2004/154 nfsmapid DNS enhancements implementation.
  *
- * As per RFC 3530, file owner and group attributes in version 4 of the
+ * As per RFC 7530, file owner and group attributes in version 4 of the
  * NFS protocol are no longer exchanged between client and server as 32
  * bit integral values. Instead, owner and group file attributes are
  * exchanged between client and server as UTF8 strings of form
diff --git a/usr/src/uts/common/fs/nfs/nfs4_idmap.c b/usr/src/uts/common/fs/nfs/nfs4_idmap.c
index 35afec00d2..c0e2492d56 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_idmap.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_idmap.c
@@ -25,7 +25,7 @@
 
 /*
  * There are well defined policies for mapping uid and gid values to and
- * from utf8 strings, as specified in RFC 3530. The protocol ops that are
+ * from utf8 strings, as specified in RFC 7530. The protocol ops that are
  * most significantly affected by any changes in policy are GETATTR and
  * SETATTR, as these have different behavior depending on whether the id
  * mapping code is executing on the client or server. Thus, the following
@@ -1267,12 +1267,15 @@ nfs_idmap_reclaim(void *arg)
  * string. If found, the corresponding mapping is returned in id_buf and
  * the cache entry is updated to the head of the LRU list. The computed
  * hash queue number, is returned in hashno.
+ *
+ * cip    - cache info ptr
+ * u8s    - utf8 string to resolve
+ * hashno - hash number, retval
+ * id_buf - if found, id for u8s
  */
 static uint_t
-nfs_idmap_cache_s2i_lkup(idmap_cache_info_t *cip,	/* cache info ptr */
-			utf8string *u8s,	/* utf8 string to resolve */
-			uint_t *hashno,		/* hash number, retval */
-			uid_t *id_buf)		/* if found, id for u8s */
+nfs_idmap_cache_s2i_lkup(idmap_cache_info_t *cip, utf8string *u8s,
+    uint_t *hashno, uid_t *id_buf)
 {
 	nfsidmap_t	*p;
 	nfsidmap_t	*pnext;
@@ -1345,13 +1348,16 @@ nfs_idmap_cache_s2i_lkup(idmap_cache_info_t *cip,	/* cache info ptr */
  * to do it. If NOT found, then a new entry is allocated for the specified
  * cache, and inserted. The hash queue number is obtained from hash_number
  * if the behavior is HQ_HASH_HINT, or computed otherwise.
+ *
+ * cip         - cache info ptr
+ * id          - id result from upcall
+ * u8s         - utf8 string to resolve
+ * behavior    - hash algorithm behavior
+ * hash_number - hash number iff hint
  */
 static void
-nfs_idmap_cache_s2i_insert(idmap_cache_info_t *cip,	/* cache info ptr */
-			uid_t id,		/* id result from upcall */
-			utf8string *u8s,	/* utf8 string to resolve */
-			hash_stat behavior,	/* hash algorithm behavior */
-			uint_t hash_number)	/* hash number iff hint */
+nfs_idmap_cache_s2i_insert(idmap_cache_info_t *cip, uid_t id, utf8string *u8s,
+    hash_stat behavior, uint_t hash_number)
 {
 	uint_t			 hashno;
 	char			*c_str;
@@ -1445,12 +1451,15 @@ nfs_idmap_cache_s2i_insert(idmap_cache_info_t *cip,	/* cache info ptr */
  * If found, the corresponding mapping is returned in u8s and the
  * cache entry is updated to the head of the LRU list. The computed
  * hash queue number, is returned in hashno.
+ *
+ * cip    - cache info ptr
+ * id     - id to resolve
+ * hashno - hash number, retval
+ * u8s    - if found, utf8 str for id
  */
 static uint_t
-nfs_idmap_cache_i2s_lkup(idmap_cache_info_t *cip,   /* cache info ptr */
-			uid_t id,		    /* id to resolve */
-			uint_t *hashno,		    /* hash number, retval */
-			utf8string *u8s)	/* if found, utf8 str for id */
+nfs_idmap_cache_i2s_lkup(idmap_cache_info_t *cip, uid_t id, uint_t *hashno,
+    utf8string *u8s)
 {
 	uint_t			 found_stat = 0;
 	nfsidmap_t		*p;
@@ -1513,13 +1522,16 @@ nfs_idmap_cache_i2s_lkup(idmap_cache_info_t *cip,   /* cache info ptr */
  * do it. If NOT found, then a new entry is allocated for the specified
  * cache, and inserted. The hash queue number is obtained from hash_number
  * if the behavior is HQ_HASH_HINT, or computed otherwise.
+ *
+ * cip         - cache info ptr
+ * id          - id to resolve
+ * u8s         - utf8 result from upcall
+ * behavior    - has algorithm behavior
+ * hash_number - hash number iff hint
  */
 static void
-nfs_idmap_cache_i2s_insert(idmap_cache_info_t *cip, /* cache info ptr */
-			uid_t id,		    /* id to resolve */
-			utf8string *u8s,	/* utf8 result from upcall */
-			hash_stat behavior,	/* has algorithm behavior */
-			uint_t hash_number)	/* hash number iff hint */
+nfs_idmap_cache_i2s_insert(idmap_cache_info_t *cip, uid_t id, utf8string *u8s,
+    hash_stat behavior, uint_t hash_number)
 {
 	uint_t		 hashno;
 	nfsidhq_t	*hq;
diff --git a/usr/src/uts/common/fs/nfs/nfs4_vnops.c b/usr/src/uts/common/fs/nfs/nfs4_vnops.c
index 840655f443..0d87903f41 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_vnops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_vnops.c
@@ -13998,7 +13998,7 @@ nfs4frlock_update_state(LOCK4args *lock_args, LOCKU4args *locku_args,
 		 * Clean that up here.  It's unclear whether we should do
 		 * this even if the filesystem has been forcibly unmounted.
 		 * For most servers, it's probably wasted effort, but
-		 * RFC3530 lets servers require that unlocks exactly match
+		 * RFC 7530 lets servers require that unlocks exactly match
 		 * the locks that are held.
 		 */
 		if (resend_rqstp != NULL &&
diff --git a/usr/src/uts/common/nfs/nfs4_kprot.h b/usr/src/uts/common/nfs/nfs4_kprot.h
index 30d1e438cd..e3acc9b901 100644
--- a/usr/src/uts/common/nfs/nfs4_kprot.h
+++ b/usr/src/uts/common/nfs/nfs4_kprot.h
@@ -269,7 +269,7 @@ typedef uint32_t aceflag4;
 #define	ACE4_FAILED_ACCESS_ACE_FLAG 0x00000020
 #define	ACE4_IDENTIFIER_GROUP 0x00000040
 /*
- * This defines all valid flag bits, as defined by RFC 3530.  If
+ * This defines all valid flag bits, as defined by RFC 7530.  If
  * any additional flag bits are deemed part of the NFSv4 spec,
  * you must also add them to the definition below.
  */
@@ -304,7 +304,7 @@ typedef uint32_t acemask4;
 #define	ACE4_GENERIC_WRITE 0x00160106
 #define	ACE4_GENERIC_EXECUTE 0x001200A0
 /*
- * This defines all valid access mask bits, as defined by RFC 3530.  If
+ * This defines all valid access mask bits, as defined by RFC 7530.  If
  * any additional access mask bits are deemed part of the NFSv4 spec,
  * you must also add them to the definition below.
  */