Additional git pbchk fixes.

4 files changed, 19 insertions, 11 deletions

diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c
index f0f8dea0d9..94e1e92a82 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c
@@ -38,7 +38,7 @@
  *
  * CAUTION:  This file is kept in sync with it's uts counterpart:
  *
- * 	usr/src/uts/common/fs/nfs/nfs4_xdr.c
+ *	usr/src/uts/common/fs/nfs/nfs4_xdr.c
  *
  * However, it is not an exact copy.  NEVER copy uts's nfs4_xdr.c
  * directly over this file.   Changes from the uts version must be
diff --git a/usr/src/uts/common/fs/nfs/nfs4_attr.c b/usr/src/uts/common/fs/nfs/nfs4_attr.c
index 820b804312..b849bda1b2 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_attr.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_attr.c
@@ -63,7 +63,7 @@ timestruc_to_settime4(timestruc_t *tt, settime4 *tt4, int flags)
 /* ARGSUSED */
 static bool_t
 nfs4_ver_fattr4_attr(vattr_t *vap, struct nfs4_ntov_map *ntovp,
-	union nfs4_attr_u *nap, int flags, int *errorp)
+    union nfs4_attr_u *nap, int flags, int *errorp)
 {
 	bool_t	retval = TRUE;
 
@@ -151,8 +151,8 @@ nfs4_ver_fattr4_attr(vattr_t *vap, struct nfs4_ntov_map *ntovp,
  */
 static bool_t
 nfs4_set_fattr4_attr(vattr_t *vap, vsecattr_t *vsap,
-	struct nfs4_ntov_map *ntovp, union nfs4_attr_u *nap, int flags,
-	int *errorp)
+    struct nfs4_ntov_map *ntovp, union nfs4_attr_u *nap, int flags,
+    int *errorp)
 {
 	bool_t	retval = TRUE;
 
@@ -230,7 +230,7 @@ nfs4_set_fattr4_attr(vattr_t *vap, vsecattr_t *vsap,
  */
 int
 vattr_to_fattr4(vattr_t *vap, vsecattr_t *vsap, fattr4 *fattrp, int flags,
-		enum nfs_opnum4 op, bitmap4 supp)
+    enum nfs_opnum4 op, bitmap4 supp)
 {
 	int i, j;
 	union nfs4_attr_u *na = NULL;
diff --git a/usr/src/uts/common/nfs/Makefile b/usr/src/uts/common/nfs/Makefile
index 5d9d326368..dc3081e331 100644
--- a/usr/src/uts/common/nfs/Makefile
+++ b/usr/src/uts/common/nfs/Makefile
@@ -21,7 +21,7 @@
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# 
+#
 # uts/common/nfs/Makefile
 #
 # include global definitions
@@ -30,7 +30,7 @@ include ../../../Makefile.master
 
 HDRS=	export.h	lm.h						\
 	mount.h		nfs.h		nfssys.h	nfs_acl.h	\
-	nfs_clnt.h	nfs_log.h 	nfs_sec.h	nfs4.h		\
+	nfs_clnt.h	nfs_log.h	nfs_sec.h	nfs4.h		\
 	nfs4_attr.h	nfs4_clnt.h	rnode.h		rnode4.h	\
 	nfs4_kprot.h	nfs4_db_impl.h	nfs4_idmap_impl.h \
 	nfsid_map.h	auth.h		nfs_cmd.h	nfs4x.h
diff --git a/usr/src/uts/common/nfs/nfs4x.h b/usr/src/uts/common/nfs/nfs4x.h
index 9606d14f2c..52c5f7f74c 100644
--- a/usr/src/uts/common/nfs/nfs4x.h
+++ b/usr/src/uts/common/nfs/nfs4x.h
@@ -13,8 +13,12 @@
  * Copyright 2017 RackTop Systems.
  */
 
-#ifndef _NFS4X_SRV_H
-#define	_NFS4X_SRV_H
+#ifndef _NFS4X_H
+#define	_NFS4X_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 #ifdef _KERNEL
 
@@ -107,7 +111,7 @@ typedef struct {
  *                             |  | status, slot, seqid, resp *||
  *                             |  +----------------------------+|
  *			       | .				|
- *			       | : 				|
+ *			       | :				|
  *                             +--------------------------------+
  *                             stok_t
  */
@@ -192,4 +196,8 @@ void rfs4x_sequence_done(COMPOUND4res *, struct compound_state *);
 
 #endif	/* _KERNEL */
 
-#endif /* _NFS4_SRV_H */
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _NFS4X_H */