12303 nfs/nfs4_drc.h: No such file or directory

Review Request #2516 — Created Feb. 12, 2020 and submitted Feb. 14, 2020, 11:01 p.m.

Information
Owner:	citrus
Repository:	illumos-gate
Branch:	master
Bugs:	12303
Depends On:
Commit:	ba24e62...
Reviewers
Groups:	general
People:

Description

Testing Done

Ship it!

```
Ship It!
```

Did you tried simply remove the nfs4_drc.h include from nfs4.h instead of shipping nfs4_drc.h?  Maybe you'll need to add something like typedef struct rfs4_drc rfs4_drc_t; to nfs4.h to make everything compilable again, but other that that it should work.  I do not think there is something valuable in nfs4_drc.h that justifies its shipment.

danmcd Feb. 12, 2020, 4:04 p.m.

If this works w/o breaking lsof, do this instead.

danmcd Feb. 12, 2020, 4:05 p.m.

NOTE: Testing for this would involve before/after disassemblies on the nfssrv module.

marcel Feb. 12, 2020, 4:09 p.m.
```
Simple wsdiff build should be enough...
```

vgusev Feb. 12, 2020, 4:11 p.m.

Andy, Couldy you try this change ?
diff --git a/usr/src/uts/common/nfs/nfs4.h b/usr/src/uts/common/nfs/nfs4.h

index ce09473f95..0454f44dab 100644

--- a/usr/src/uts/common/nfs/nfs4.h

+++ b/usr/src/uts/common/nfs/nfs4.h

@@ -40,7 +40,6 @@
#ifdef _KERNEL

 #include <nfs/nfs4_kprot.h>

-#include <nfs/nfs4_drc.h>

 #include <sys/nvpair.h>

 #else

 #include <rpcsvc/nfs4_prot.h>

@@ -807,7 +806,7 @@ typedef struct nfs4_srv {

/

        rfs4_dss_path_t dss_pathlist;

        / Duplicate request cache /

-       rfs4_drc_t      nfs4_drc;

+       struct rfs4_drc nfs4_drc;

        / nfsv4 server start time /

        time_t rfs4_start_time;

        / Used to serialize lookups of clientids /

vgusev Feb. 12, 2020, 4:13 p.m.

Sorry, this one:

diff --git a/usr/src/uts/common/nfs/nfs4.h b/usr/src/uts/common/nfs/nfs4.h
index ce09473f95..0454f44dab 100644
--- a/usr/src/uts/common/nfs/nfs4.h
+++ b/usr/src/uts/common/nfs/nfs4.h
@@ -40,7 +40,6 @@

 #ifdef _KERNEL
 #include <nfs/nfs4_kprot.h>
-#include <nfs/nfs4_drc.h>
 #include <sys/nvpair.h>
 #else
 #include <rpcsvc/nfs4_prot.h>
@@ -807,7 +806,7 @@ typedef struct nfs4_srv {
         */
        rfs4_dss_path_t *dss_pathlist;
        /* Duplicate request cache */
-       rfs4_drc_t      *nfs4_drc;
+       struct rfs4_drc *nfs4_drc;
        /* nfsv4 server start time */
        time_t rfs4_start_time;
        /* Used to serialize lookups of clientids */

vgusev Feb. 12, 2020, 4:14 p.m.
```
It should fix compilation problem.
```

Commit:

-	96a9af378f7a105ee28c488e60319f0d8b93028e
+	ba24e624c7e170a06a420ec6f4389fc0e8ca597e

Diff:

Revision 2 (+1 -2)

Show changes

usr/src/uts/common/nfs/nfs4.h

Summary:

-	12303 Ship nfs4_drc.h
+	12303 nfs/nfs4_drc.h: No such file or directory

Description:

~		12303 Ship nfs4_drc.h
	~	12303 nfs/nfs4_drc.h: No such file or directory

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

You have a pending review.

Review Board 3.0.18

12303 nfs/nfs4_drc.h: No such file or directory

Commit:

Diff:

Summary:

Description:

Status: Closed (submitted)