pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Jan2025/001 patches
Posted by Anonymous on Mon 27th Jan 2025 13:08
raw | new post

  1. From 56803c3980a0ae29b7364e3d3fc3562750fc57d3 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Wed, 8 Jan 2025 11:22:50 +0100
  4. Subject: [PATCH 01/44] daemon: Fix buffer overflow with long filenames in
  5.  |handle_readdir()|
  6.  
  7. Fix buffer overflow with long filenames in |handle_readdir()|.
  8. Found with $ stress-ng --filename 4 #
  9.  
  10. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  11. ---
  12. daemon/readdir.c | 7 +++++++
  13.  1 file changed, 7 insertions(+)
  14.  
  15. diff --git a/daemon/readdir.c b/daemon/readdir.c
  16. index a02b70a..39b50fb 100644
  17. --- a/daemon/readdir.c
  18. +++ b/daemon/readdir.c
  19. @@ -767,6 +767,13 @@ fetch_entries:
  20.          nfs41_readdir_entry *entry = (nfs41_readdir_entry*)entry_buf;
  21.          entry->cookie = 0;
  22.          entry->name_len = (uint32_t)strlen(args->filter) + 1;
  23. +        if (entry->name_len >= NFS41_MAX_COMPONENT_LEN) {
  24. +            DPRINTF(1,
  25. +                ("entry->name_len(=%d) >= NFS41_MAX_COMPONENT_LEN\n",
  26. +                (int)entry->name_len));
  27. +            status = ERROR_FILENAME_EXCED_RANGE;
  28. +            goto out_free_cookie;
  29. +        }
  30.          StringCbCopyA(entry->name, entry->name_len, args->filter);
  31.          entry->next_entry_offset = 0;
  32.  
  33. --
  34. 2.45.1
  35.  
  36. From 88a87a8da55eecd23d4f13c8afdf59bb8b115792 Mon Sep 17 00:00:00 2001
  37. From: Roland Mainz <roland.mainz@nrubsig.org>
  38. Date: Wed, 8 Jan 2025 11:56:20 +0100
  39. Subject: [PATCH 02/44] README.md,cygwin,daemon,mount,sys,tests: Add basic
  40.  NFSv4.2 support
  41.  
  42. Add basic NFSv4.2 support, including protocol autonegotiation.
  43.  
  44. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  45. ---
  46. README.html                     |   4 +-
  47.  README.md                       |   2 +-
  48.  cygwin/README.bintarball.txt    |  29 +++++----
  49.  cygwin/devel/msnfs41client.bash |   4 +-
  50.  daemon/callback_server.c        |   5 +-
  51.  daemon/callback_xdr.c           |   2 +
  52.  daemon/lookup.c                 |   5 +-
  53.  daemon/mount.c                  |  12 +++-
  54.  daemon/name_cache.c             |   3 +-
  55.  daemon/namespace.c              |  66 +++++++++++++++++--
  56.  daemon/nfs41.h                  |   3 +
  57.  daemon/nfs41_callback.h         |   4 ++
  58.  daemon/nfs41_client.c           |  11 +++-
  59.  daemon/nfs41_compound.c         |   3 +-
  60.  daemon/nfs41_compound.h         |   1 +
  61.  daemon/nfs41_const.h            |  14 ++--
  62.  daemon/nfs41_ops.c              | 112 +++++++++++++++++++++-----------
  63.  daemon/nfs41_ops.h              |  23 +++++++
  64.  daemon/nfs41_xdr.c              |  21 ++++++
  65.  daemon/service.h                |   2 +-
  66.  daemon/upcall.h                 |   1 +
  67.  mount/mount.c                   |   3 +
  68.  sys/nfs41_driver.h              |   8 +++
  69.  sys/nfs41sys_driver.h           |   3 +
  70.  sys/nfs41sys_mount.c            |  28 +++++++-
  71.  tests/manual_testing.txt        |  20 +++---
  72.  tests/nfs_server_setup.txt      |   4 +-
  73.  27 files changed, 299 insertions(+), 94 deletions(-)
  74.  
  75. diff --git a/README.html b/README.html
  76. index c96aa0a..3400e4c 100644
  77. --- a/README.html
  78. +++ b/README.html
  79. @@ -3,7 +3,7 @@
  80.  <html xmlns="http://www.w3.org/1999/xhtml">
  81.  <head>
  82.      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  83. -    <title>Windows NFS 4.1 Client Instructions</title>
  84. +    <title>Windows NFS 4.2 Client Instructions</title>
  85.      <link rel="stylesheet" title="CITI Default" href="http://www.citi.umich.edu/format/citi.css" type="text/css"/>
  86.      <link rel="icon" href="http://www.citi.umich.edu/images/citilogo-16x16.png" type="image/png"/>
  87.      <link rel="shortcut icon" href="http://www.citi.umich.edu/images/citilogo-16x16.png" type="image/png"/>
  88. @@ -23,7 +23,7 @@
  89.  </head>
  90.  <body>
  91.  <div id="page">
  92. -<h1>Windows NFS 4.1 Client Instructions</h1>
  93. +<h1>Windows NFS 4.2 Client Instructions</h1>
  94.  <div id="content">
  95.  <div id="index">
  96.  <ol>
  97. diff --git a/README.md b/README.md
  98. index 4568f14..71b0448 100644
  99. --- a/README.md
  100. +++ b/README.md
  101. @@ -1,5 +1,5 @@
  102.  
  103. -# Windows NFS 4.1 Client Instructions
  104. +# Windows NFS 4.2 Client Instructions
  105.  
  106.  1.  [Building from Source](#build)
  107.  2.  [Installing Binaries](#install)
  108. diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt
  109. index 0afaecc..de64241 100644
  110. --- a/cygwin/README.bintarball.txt
  111. +++ b/cygwin/README.bintarball.txt
  112. @@ -10,13 +10,13 @@
  113.  #
  114.  # 1. What is this ?
  115.  #
  116. -NFSv4.1 filesystem driver for Windows 10/11&Windows Server 2019
  117. +NFSv4.2/NFSv4.1 filesystem driver for Windows 10/11&Windows Server 2019
  118.  
  119.  
  120.  #
  121.  # 2. Features:
  122.  #
  123. -- Full NFSv4.1 protocol support
  124. +- Full NFSv4.2/NFSv4.1 protocol support
  125.  
  126.  - idmapper (mapping usernames and uid/gid values between server and
  127.      client)
  128. @@ -50,7 +50,7 @@ NFSv4.1 filesystem driver for Windows 10/11&Windows Server 2019
  129.        cd //derfwnb4966@2049/nfs4/bigdisk/mysqldb4/
  130.  
  131.  - WSL support
  132. -    - Mount Windows NFSv4.1 shares via drive letter or UNC path
  133. +    - Mount Windows NFSv4.2 shares via drive letter or UNC path
  134.        in WSL via mount -t drvfs
  135.      - Supports NFS owner/group to WSL uid/gid mapping
  136.  
  137. @@ -80,18 +80,19 @@ NFSv4.1 filesystem driver for Windows 10/11&Windows Server 2019
  138.      - Supports primary group changes in the calling process/thread
  139.        (via |SetTokenInformation(..., TokenPrimaryGroup,...)|), e.g.
  140.        if the calling process/threads switches the primary group
  141. -      in its access token then the NFSv4.1 client will use that
  142. +      in its access token then the NFSv4.2 client will use that
  143.        group as GID for file creation.
  144.      - newgrp(1)/sg(1)-style "winsg" utilty to run cmd.exe with
  145.        different primary group, e.g.
  146.        $ winsg [-] -g group [-c command | /C command] #
  147.  
  148.  - Software compatibility:
  149. -    - Any NFSv4.1 server (Linux, Solaris, Illumos, FreeBSD, nfs4j,
  150. -        ...)
  151. +    - Any NFSv4.2/NFSv4.1 server (Linux, Solaris, Illumos,
  152. +        FreeBSD, nfs4j, ...)
  153.      - All tools from Cygwin/MSYS2/MinGW
  154.      - Visual Studio
  155. -    - VMware Workstation (can use VMs hosted on NFSv4.1 filesystem)
  156. +    - VMware Workstation (can use VMs hosted on NFSv4.2/NFSv4.1
  157. +        filesystem)
  158.  
  159.  
  160.  #
  161. @@ -189,7 +190,7 @@ echo %PROCESSOR_ARCHITECTURE%
  162.  - Cygwin 64bit can be installed like this:
  163.  # ---- snip ----
  164.  # Install Cygwin 64bit on Windows 64bit with packages required by "ms-nfs41-client"
  165. -# (Windows NFSv4.1 client):
  166. +# (Windows NFSv4.2 client):
  167.  # 1. Create subdir
  168.  mkdir download
  169.  cd download
  170. @@ -203,7 +204,7 @@ setup-x86_64.exe -q --site "https://mirrors.kernel.org/sourceware/cygwin" -P cyg
  171.  - Cygwin 32bit can be installed like this:
  172.  # ---- snip ----
  173.  # Install Cygwin 32bit on Windows 32bit with packages required by "ms-nfs41-client"
  174. -# (Windows NFSv4.1 client):
  175. +# (Windows NFSv4.2 client):
  176.  # 1. Create subdir
  177.  mkdir download
  178.  cd download
  179. @@ -346,7 +347,7 @@ $ cd ~ && /sbin/nfs_umount '\0.49.202.230@2049\nfs4\net_tmpfs2'
  180.  $ cd ~
  181.  $ net use '\\10.49.202.230@2049\nfs4\net_tmpfs2' /delete
  182.  
  183. -# List mounted NFSv4.1 filesystems:
  184. +# List mounted NFSv4.2 filesystems:
  185.  $ /sbin/nfs_mount
  186.  
  187.  
  188. @@ -369,8 +370,8 @@ does not wait until nfsd*.exe is available for accepting mounts.
  189.  
  190.  
  191.  # WSL usage:
  192. -Example 1: Mount Windows NFSv4.1 share via Windows drive letter
  193. -# Mount NFSv4.1 share in Windows to drive letter 'N':
  194. +Example 1: Mount Windows NFSv4.2 share via Windows drive letter
  195. +# Mount NFSv4.2 share in Windows to drive letter 'N':
  196.  ---- snip ----
  197.  $ /sbin/nfs_mount -o rw 'N' nfs://10.49.202.230//bigdisk
  198.  Successfully mounted '10.49.202.230@2049' to drive 'N:'
  199. @@ -383,8 +384,8 @@ $ mkdir /mnt/n
  200.  $ mount -t drvfs N: /mnt/n
  201.  ---- snip ----
  202.  
  203. -Example 2: Mount Windows NFSv4.1 share via UNC path:
  204. -# Mount NFSv4.1 share in Windows
  205. +Example 2: Mount Windows NFSv4.2 share via UNC path:
  206. +# Mount NFSv4.2 share in Windows
  207.  ---- snip ----
  208.  $ /sbin/nfs_mount -o rw nfs://10.49.202.230//bigdisk
  209.  Successfully mounted '10.49.202.230@2049' to drive '\\10.49.202.230@2049\nfs4\bigdisk'
  210. diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash
  211. index 6c9a401..111b328 100755
  212. --- a/cygwin/devel/msnfs41client.bash
  213. +++ b/cygwin/devel/msnfs41client.bash
  214. @@ -1,8 +1,8 @@
  215.  #!/bin/bash
  216.  
  217.  #
  218. -# msnfs41client.bash - simple Cygwin frontent for the msnfsv41
  219. -# NFSv4.1 filesystem driver development
  220. +# msnfs41client.bash - simple Cygwin frontent for the msnfs41client
  221. +# NFSv4.2/NFSv4.1 filesystem driver development
  222.  #
  223.  
  224.  #
  225. diff --git a/daemon/callback_server.c b/daemon/callback_server.c
  226. index dc3139a..7c41917 100644
  227. --- a/daemon/callback_server.c
  228. +++ b/daemon/callback_server.c
  229. @@ -387,9 +387,10 @@ static void handle_cb_compound(nfs41_rpc_clnt *rpc_clnt, cb_req *req, struct cb_
  230.      }
  231.  
  232.      DPRINTF(CBSLVL, ("CB_COMPOUND('%s', %u)\n", args.tag.str, args.argarray_count));
  233. -    if (args.minorversion != 1) {
  234. +    if ((args.minorversion != 1) && (args.minorversion != 2)) {
  235.          res->status = NFS4ERR_MINOR_VERS_MISMATCH; //XXXXX
  236. -        eprintf("args.minorversion %u != 1\n", args.minorversion);
  237. +        eprintf("handle_cb_compound: args.minorversion %u != 1/2\n",
  238. +            (unsigned int)args.minorversion);
  239.          goto out;
  240.      }
  241.  
  242. diff --git a/daemon/callback_xdr.c b/daemon/callback_xdr.c
  243. index d2f4e24..c69341a 100644
  244. --- a/daemon/callback_xdr.c
  245. +++ b/daemon/callback_xdr.c
  246. @@ -574,6 +574,7 @@ static const struct xdr_discrim cb_argop_discrim[] = {
  247.      { OP_CB_WANTS_CANCELLED, (xdrproc_t)op_cb_wants_cancelled_args },
  248.      { OP_CB_NOTIFY_LOCK,     (xdrproc_t)op_cb_notify_lock_args },
  249.      { OP_CB_NOTIFY_DEVICEID, (xdrproc_t)op_cb_notify_deviceid_args },
  250. +    { OP_CB_OFFLOAD,         NULL_xdrproc_t },
  251.      { OP_CB_ILLEGAL,         NULL_xdrproc_t },
  252.  };
  253.  
  254. @@ -623,6 +624,7 @@ static const struct xdr_discrim cb_resop_discrim[] = {
  255.      { OP_CB_WANTS_CANCELLED, (xdrproc_t)op_cb_wants_cancelled_res },
  256.      { OP_CB_NOTIFY_LOCK,     (xdrproc_t)op_cb_notify_lock_res },
  257.      { OP_CB_NOTIFY_DEVICEID, (xdrproc_t)op_cb_notify_deviceid_res },
  258. +    { OP_CB_OFFLOAD,         NULL_xdrproc_t },
  259.      { OP_CB_ILLEGAL,         NULL_xdrproc_t },
  260.  };
  261.  
  262. diff --git a/daemon/lookup.c b/daemon/lookup.c
  263. index ee883b9..a27e923 100644
  264. --- a/daemon/lookup.c
  265. +++ b/daemon/lookup.c
  266. @@ -40,7 +40,7 @@
  267.   * We use |128| here to pack as much data into one compound
  268.   * to optimise for high latency links (satellite, ssh tunnel etc.)
  269.   *
  270. - * The real value is negotiated with the NFSv4.1 server
  271. + * The real value is negotiated with the NFSv4.2/4.1 server
  272.   * at session creation time (e.g. (|min(
  273.   * session->fore_chan_attrs.ca_maxoperations|,
  274.   * MAX_LOOKUP_COMPONENTS)|), see |max_lookup_components()| below.
  275. @@ -135,7 +135,8 @@ static int lookup_rpc(
  276.      nfs_argop4 argops[4+MAX_LOOKUP_COMPONENTS*3];
  277.      nfs_resop4 resops[4+MAX_LOOKUP_COMPONENTS*3];
  278.  
  279. -    compound_init(&compound, argops, resops, "lookup");
  280. +    compound_init(&compound, session->client->root->nfsminorvers,
  281. +        argops, resops, "lookup");
  282.  
  283.      compound_add_op(&compound, OP_SEQUENCE, &args->sequence, &res->sequence);
  284.      nfs41_session_sequence(&args->sequence, session, 0);
  285. diff --git a/daemon/mount.c b/daemon/mount.c
  286. index 63c5e1f..be8854f 100644
  287. --- a/daemon/mount.c
  288. +++ b/daemon/mount.c
  289. @@ -52,11 +52,15 @@ static int parse_mount(unsigned char *buffer, uint32_t length, nfs41_upcall *upc
  290.      if (status) goto out;
  291.      status = safe_read(&buffer, &length, &args->use_nfspubfh, sizeof(DWORD));
  292.      if (status) goto out;
  293. +    status = safe_read(&buffer, &length, &args->nfsvers, sizeof(DWORD));
  294. +    if (status) goto out;
  295.  
  296.      DPRINTF(1, ("parsing NFS41_SYSOP_MOUNT: hostport='%s' root='%s' "
  297. -        "sec_flavor='%s' rsize=%d wsize=%d use_nfspubfh=%d\n",
  298. +        "sec_flavor='%s' rsize=%d wsize=%d use_nfspubfh=%d "
  299. +        "nfsvers=%d\n",
  300.          args->hostport, args->path, secflavorop2name(args->sec_flavor),
  301. -        args->rsize, args->wsize, args->use_nfspubfh));
  302. +        args->rsize, args->wsize, args->use_nfspubfh,
  303. +        args->nfsvers));
  304.      return status;
  305.  out:
  306.      DPRINTF(1, ("parsing NFS41_SYSOP_MOUNT: failed %d\n", status));
  307. @@ -148,7 +152,9 @@ static int handle_mount(void *daemon_context, nfs41_upcall *upcall)
  308.      } else {
  309.          // create root
  310.          status = nfs41_root_create(hostname, port,
  311. -            args->use_nfspubfh?true:false, args->sec_flavor,
  312. +            args->use_nfspubfh?true:false,
  313. +            args->nfsvers,
  314. +            args->sec_flavor,
  315.              args->wsize + WRITE_OVERHEAD, args->rsize + READ_OVERHEAD, &root);
  316.          if (status) {
  317.              eprintf("nfs41_root_create(hostname='%s', port=%d) failed %d\n",
  318. diff --git a/daemon/name_cache.c b/daemon/name_cache.c
  319. index a5e5a1e..444512b 100644
  320. --- a/daemon/name_cache.c
  321. +++ b/daemon/name_cache.c
  322. @@ -1356,7 +1356,8 @@ static int rpc_array_putfh(
  323.  
  324.      *valid_out = 0;
  325.  
  326. -    compound_init(&compound, argops, resops, "array_putfh");
  327. +    compound_init(&compound, session->client->root->nfsminorvers,
  328. +        argops, resops, "array_putfh");
  329.  
  330.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  331.      nfs41_session_sequence(&sequence_args, session, 0);
  332. diff --git a/daemon/namespace.c b/daemon/namespace.c
  333. index e0faf23..811e715 100644
  334. --- a/daemon/namespace.c
  335. +++ b/daemon/namespace.c
  336. @@ -26,6 +26,9 @@
  337.  #include "nfs41_ops.h"
  338.  #include "util.h"
  339.  #include "daemon_debug.h"
  340. +/* for |ERROR_NFS_VERSION_MISMATCH|+|NFS_VERSION_AUTONEGOTIATION| */
  341. +#include "nfs41_driver.h"
  342. +
  343.  
  344.  
  345.  #define NSLVL 2 /* dprintf level for namespace logging */
  346. @@ -39,6 +42,7 @@ int nfs41_root_create(
  347.      IN const char *name,
  348.      IN uint32_t port,
  349.      IN bool use_nfspubfh,
  350. +    IN DWORD nfsvers,
  351.      IN uint32_t sec_flavor,
  352.      IN uint32_t wsize,
  353.      IN uint32_t rsize,
  354. @@ -47,7 +51,10 @@ int nfs41_root_create(
  355.      int status = NO_ERROR;
  356.      nfs41_root *root;
  357.  
  358. -    DPRINTF(NSLVL, ("--> nfs41_root_create(name='%s', port=%d)\n", name, port));
  359. +    DPRINTF(NSLVL,
  360. +        ("--> nfs41_root_create(name='%s', port=%d, "
  361. +            "use_nfspubfh=%d, nfsvers=%d)\n",
  362. +            name, port, (int)use_nfspubfh, (int)nfsvers));
  363.  
  364.      root = calloc(1, sizeof(nfs41_root));
  365.      if (root == NULL) {
  366. @@ -57,6 +64,17 @@ int nfs41_root_create(
  367.  
  368.      list_init(&root->clients);
  369.      root->use_nfspubfh = use_nfspubfh;
  370. +    if (nfsvers == NFS_VERSION_AUTONEGOTIATION) {
  371. +        /*
  372. +         * Use auto negotiation, |nfs41_root_mount_addrs()| will
  373. +         * set |root->nfsminorvers| to the minor version being used
  374. +         */
  375. +        root->nfsminorvers = NFS_VERSION_AUTONEGOTIATION;
  376. +    }
  377. +    else {
  378. +        root->nfsminorvers = nfsvers % 10; /* 41 --> 1, 42 --> 2, ... */
  379. +        EASSERT((root->nfsminorvers >= 1) && (root->nfsminorvers <= 2));
  380. +    }
  381.      root->wsize = wsize;
  382.      root->rsize = rsize;
  383.      InitializeCriticalSection(&root->lock);
  384. @@ -64,7 +82,8 @@ int nfs41_root_create(
  385.      root->sec_flavor = sec_flavor;
  386.  
  387.      /* generate a unique client_owner */
  388. -    status = nfs41_client_owner(name, port, use_nfspubfh, sec_flavor, &root->client_owner);
  389. +    status = nfs41_client_owner(name, port, root->nfsminorvers,
  390. +        use_nfspubfh, sec_flavor, &root->client_owner);
  391.      if (status) {
  392.          eprintf("nfs41_client_owner() failed with %d\n", status);
  393.          free(root);
  394. @@ -368,12 +387,49 @@ int nfs41_root_mount_addrs(
  395.          goto out;
  396.      }
  397.  
  398. +    bool nfsminorvers_autonegotiate = false;
  399. +
  400. +    /*
  401. +     * NFSv4 protocol minor version "autonegotiation"
  402. +     * First try with 4.2, and if this fails try 4.1
  403. +     */
  404. +    if (root->nfsminorvers == NFS_VERSION_AUTONEGOTIATION) {
  405. +        root->nfsminorvers = 2;
  406. +        nfsminorvers_autonegotiate = true;
  407. +    }
  408. +
  409. +retry_nfs41_exchange_id:
  410. +    if (nfsminorvers_autonegotiate) {
  411. +        DPRINTF(0, ("nfs41_root_mount_addrs: "
  412. +            "Autonegotiating NFS version, "
  413. +            "trying NFSv4.%d\n",
  414. +            (int)root->nfsminorvers));
  415. +    }
  416. +
  417.      /* get a clientid with exchangeid */
  418. -    status = nfs41_exchange_id(rpc, &root->client_owner,
  419. +    status = nfs41_exchange_id(rpc, root->nfsminorvers,
  420. +        &root->client_owner,
  421.          nfs41_exchange_id_flags(is_data), &exchangeid);
  422.      if (status) {
  423. -        eprintf("nfs41_exchange_id() failed '%s'\n", nfs_error_string(status));
  424. -        status = ERROR_BAD_NET_RESP;
  425. +        if (status == NFS4ERR_MINOR_VERS_MISMATCH) {
  426. +            if (nfsminorvers_autonegotiate &&
  427. +                (root->nfsminorvers >= 1)) {
  428. +                root->nfsminorvers--;
  429. +                goto retry_nfs41_exchange_id;
  430. +            }
  431. +
  432. +            eprintf("nfs41_root_mount_addrs: "
  433. +                "nfs41_exchange_id() NFS4ERR_MINOR_VERS_MISMATCH,"
  434. +                "nfsminorvers=%d failed\n",
  435. +                (int)root->nfsminorvers);
  436. +            status = ERROR_NFS_VERSION_MISMATCH;
  437. +        }
  438. +        else {
  439. +            eprintf("nfs41_root_mount_addrs: "
  440. +                "nfs41_exchange_id() failed '%s'\n",
  441. +                nfs_error_string(status));
  442. +            status = ERROR_BAD_NET_RESP;
  443. +        }
  444.          goto out_free_rpc;
  445.      }
  446.  
  447. diff --git a/daemon/nfs41.h b/daemon/nfs41.h
  448. index f5607a6..e6e82ad 100644
  449. --- a/daemon/nfs41.h
  450. +++ b/daemon/nfs41.h
  451. @@ -300,6 +300,7 @@ typedef struct __nfs41_root {
  452.      CRITICAL_SECTION lock;
  453.      struct list_entry clients;
  454.      bool use_nfspubfh;
  455. +    DWORD nfsminorvers;
  456.      uint32_t wsize;
  457.      uint32_t rsize;
  458.  #pragma warning( push )
  459. @@ -318,6 +319,7 @@ int nfs41_root_create(
  460.      IN const char *name,
  461.      IN uint32_t port,
  462.      IN bool use_nfspubfh,
  463. +    IN DWORD nfsvers,
  464.      IN uint32_t sec_flavor,
  465.      IN uint32_t wsize,
  466.      IN uint32_t rsize,
  467. @@ -436,6 +438,7 @@ void nfs41_server_addrs(
  468.  int nfs41_client_owner(
  469.      IN const char *name,
  470.      IN uint32_t port,
  471. +    IN int nfsminorvers,
  472.      IN bool use_nfspubfh,
  473.      IN uint32_t sec_flavor,
  474.      OUT client_owner4 *owner);
  475. diff --git a/daemon/nfs41_callback.h b/daemon/nfs41_callback.h
  476. index 58e5080..c829920 100644
  477. --- a/daemon/nfs41_callback.h
  478. +++ b/daemon/nfs41_callback.h
  479. @@ -35,6 +35,7 @@ enum nfs41_callback_proc {
  480.  enum nfs41_callback_op {
  481.      OP_CB_GETATTR           = 3,
  482.      OP_CB_RECALL            = 4,
  483. +    /* Callback operations new to NFSv4.1 */
  484.      OP_CB_LAYOUTRECALL      = 5,
  485.      OP_CB_NOTIFY            = 6,
  486.      OP_CB_PUSH_DELEG        = 7,
  487. @@ -45,6 +46,9 @@ enum nfs41_callback_op {
  488.      OP_CB_WANTS_CANCELLED   = 12,
  489.      OP_CB_NOTIFY_LOCK       = 13,
  490.      OP_CB_NOTIFY_DEVICEID   = 14,
  491. +    /* Callback operations new to NFSv4.2 */
  492. +    OP_CB_OFFLOAD = 15,
  493. +
  494.      OP_CB_ILLEGAL           = 10044
  495.  };
  496.  
  497. diff --git a/daemon/nfs41_client.c b/daemon/nfs41_client.c
  498. index aa2cc25..b33a22d 100644
  499. --- a/daemon/nfs41_client.c
  500. +++ b/daemon/nfs41_client.c
  501. @@ -174,7 +174,8 @@ int nfs41_client_renew(
  502.      nfs41_exchange_id_res exchangeid = { 0 };
  503.      int status;
  504.  
  505. -    status = nfs41_exchange_id(client->rpc, &client->owner,
  506. +    status = nfs41_exchange_id(client->rpc,
  507. +        client->root->nfsminorvers, &client->owner,
  508.          nfs41_exchange_id_flags(client->is_data), &exchangeid);
  509.      if (status) {
  510.          eprintf("nfs41_exchange_id() failed with %d\n", status);
  511. @@ -362,6 +363,7 @@ out:
  512.  int nfs41_client_owner(
  513.      IN const char *name,
  514.      IN uint32_t port,
  515. +    IN int nfsminorvers,
  516.      IN bool use_nfspubfh,
  517.      IN uint32_t sec_flavor,
  518.      OUT client_owner4 *owner)
  519. @@ -421,6 +423,13 @@ int nfs41_client_owner(
  520.          goto out_context;
  521.      }
  522.  
  523. +    if (!CryptHashData(hash,
  524. +        (const BYTE*)&nfsminorvers, (DWORD)sizeof(int), 0)) {
  525. +        status = GetLastError();
  526. +        eprintf("CryptHashData() failed with %d\n", status);
  527. +        goto out_hash;
  528. +    }
  529. +
  530.      if (!CryptHashData(hash,
  531.          (const BYTE*)&use_nfspubfh, (DWORD)sizeof(bool), 0)) {
  532.          status = GetLastError();
  533. diff --git a/daemon/nfs41_compound.c b/daemon/nfs41_compound.c
  534. index 08faf55..ecee929 100644
  535. --- a/daemon/nfs41_compound.c
  536. +++ b/daemon/nfs41_compound.c
  537. @@ -40,6 +40,7 @@ int compound_error(int status)
  538.  
  539.  void compound_init(
  540.      nfs41_compound *compound,
  541. +    int minorversion,
  542.      nfs_argop4 *argops,
  543.      nfs_resop4 *resops,
  544.      const char *tag)
  545. @@ -47,7 +48,7 @@ void compound_init(
  546.      /* initialize args */
  547.      compound->args.tag_len = (uint32_t)strlen(tag);
  548.      memcpy(compound->args.tag, tag, compound->args.tag_len);
  549. -    compound->args.minorversion = 1;
  550. +    compound->args.minorversion = minorversion;
  551.      compound->args.argarray_count = 0;
  552.      compound->args.argarray = argops;
  553.  
  554. diff --git a/daemon/nfs41_compound.h b/daemon/nfs41_compound.h
  555. index d222559..db75c2c 100644
  556. --- a/daemon/nfs41_compound.h
  557. +++ b/daemon/nfs41_compound.h
  558. @@ -62,6 +62,7 @@ int compound_error(int status);
  559.  
  560.  void compound_init(
  561.      nfs41_compound *compound,
  562. +    int minorversion,
  563.      nfs_argop4 *argops,
  564.      nfs_resop4 *resops,
  565.      const char *tag);
  566. diff --git a/daemon/nfs41_const.h b/daemon/nfs41_const.h
  567. index 0738241..a4e408c 100644
  568. --- a/daemon/nfs41_const.h
  569. +++ b/daemon/nfs41_const.h
  570. @@ -222,13 +222,13 @@ enum nfsstat4 {
  571.      NFS4ERR_DELEG_REVOKED       = 10087,    /* deleg./layout revoked   */
  572.  
  573.      /* NFSv4.2 errors start here... */
  574. -    NFS4ERR_PARTNER_NOTSUPP     = 10088,
  575. -    NFS4ERR_PARTNER_NO_AUTH     = 10089,
  576. -    NFS4ERR_UNION_NOTSUPP       = 10090,
  577. -    NFS4ERR_OFFLOAD_DENIED      = 10091,
  578. -    NFS4ERR_WRONG_LFS           = 10092,
  579. -    NFS4ERR_BADLABEL            = 10093,
  580. -    NFS4ERR_OFFLOAD_NO_REQS     = 10094,
  581. +    NFS4ERR_PARTNER_NOTSUPP     = 10088,    /* s2s not supported       */
  582. +    NFS4ERR_PARTNER_NO_AUTH     = 10089,    /* s2s not authorized      */
  583. +    NFS4ERR_UNION_NOTSUPP       = 10090,    /* arm of union not supp   */
  584. +    NFS4ERR_OFFLOAD_DENIED      = 10091,    /* dest not allowing copy  */
  585. +    NFS4ERR_WRONG_LFS           = 10092,    /* LFS not supported       */
  586. +    NFS4ERR_BADLABEL            = 10093,    /* incorrect label         */
  587. +    NFS4ERR_OFFLOAD_NO_REQS     = 10094,    /* dest not meeting reqs   */
  588.  
  589.      /* NFSv4 xattr (RFC 8276) error codes start here... */
  590.      NFS4ERR_NOXATTR             = 10095,
  591. diff --git a/daemon/nfs41_ops.c b/daemon/nfs41_ops.c
  592. index 5e28c09..c49cca0 100644
  593. --- a/daemon/nfs41_ops.c
  594. +++ b/daemon/nfs41_ops.c
  595. @@ -50,6 +50,7 @@
  596.  
  597.  int nfs41_exchange_id(
  598.      IN nfs41_rpc_clnt *rpc,
  599. +    IN int nfsminorvers,
  600.      IN client_owner4 *owner,
  601.      IN uint32_t flags_in,
  602.      OUT nfs41_exchange_id_res *res_out)
  603. @@ -64,7 +65,8 @@ int nfs41_exchange_id(
  604.      /* fixme: This should be a function argument */
  605.      extern nfs41_daemon_globals nfs41_dg;
  606.  
  607. -    compound_init(&compound, &argop, &resop, "exchange_id");
  608. +    compound_init(&compound, nfsminorvers,
  609. +        &argop, &resop, "exchange_id");
  610.  
  611.      compound_add_op(&compound, OP_EXCHANGE_ID, &ex_id, res_out);
  612.  
  613. @@ -142,7 +144,8 @@ int nfs41_create_session(nfs41_client *clnt, nfs41_session *session, bool_t try_
  614.      DPRINTF(1, ("--> nfs41_create_session(clnt=0x%p,session=0x%p,try_recovery=%d)\n",
  615.          clnt, session, (int)try_recovery));
  616.  
  617. -    compound_init(&compound, &argop, &resop, "create_session");
  618. +    compound_init(&compound, clnt->root->nfsminorvers,
  619. +        &argop, &resop, "create_session");
  620.  
  621.      compound_add_op(&compound, OP_CREATE_SESSION, &req, &reply);
  622.  
  623. @@ -256,7 +259,8 @@ enum nfsstat4 nfs41_bind_conn_to_session(
  624.      nfs41_bind_conn_to_session_args bind_args = { 0 };
  625.      nfs41_bind_conn_to_session_res bind_res = { 0 };
  626.  
  627. -    compound_init(&compound, &argop, &resop, "bind_conn_to_session");
  628. +    compound_init(&compound, rpc->client->root->nfsminorvers,
  629. +        &argop, &resop, "bind_conn_to_session");
  630.  
  631.      compound_add_op(&compound, OP_BIND_CONN_TO_SESSION, &bind_args, &bind_res);
  632.      bind_args.sessionid = (unsigned char *)sessionid;
  633. @@ -283,7 +287,8 @@ int nfs41_destroy_session(
  634.      nfs41_destroy_session_args ds_args;
  635.      nfs41_destroy_session_res ds_res;
  636.  
  637. -    compound_init(&compound, &argop, &resop, "destroy_session");
  638. +    compound_init(&compound, session->client->root->nfsminorvers,
  639. +        &argop, &resop, "destroy_session");
  640.  
  641.      compound_add_op(&compound, OP_DESTROY_SESSION, &ds_args, &ds_res);
  642.      ds_args.dsa_sessionid = session->session_id;
  643. @@ -312,7 +317,8 @@ int nfs41_destroy_clientid(
  644.      nfs41_destroy_clientid_args dc_args;
  645.      nfs41_destroy_clientid_res dc_res;
  646.  
  647. -    compound_init(&compound, &argops, &resops, "destroy_clientid");
  648. +    compound_init(&compound, rpc->client->root->nfsminorvers,
  649. +        &argops, &resops, "destroy_clientid");
  650.  
  651.      compound_add_op(&compound, OP_DESTROY_CLIENTID, &dc_args, &dc_res);
  652.      dc_args.dca_clientid = clientid;
  653. @@ -338,7 +344,8 @@ enum nfsstat4 nfs41_reclaim_complete(
  654.      nfs41_sequence_res sequence_res;
  655.      nfs41_reclaim_complete_res reclaim_res;
  656.  
  657. -    compound_init(&compound, argops, resops, "reclaim_complete");
  658. +    compound_init(&compound, session->client->root->nfsminorvers,
  659. +        argops, resops, "reclaim_complete");
  660.  
  661.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  662.      nfs41_session_sequence(&sequence_args, session, 0);
  663. @@ -494,7 +501,8 @@ int nfs41_open(
  664.  
  665.      attr_request.arr[0] |= FATTR4_WORD0_FSID;
  666.  
  667. -    compound_init(&compound, argops, resops, "open");
  668. +    compound_init(&compound, session->client->root->nfsminorvers,
  669. +        argops, resops, "open");
  670.  
  671.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  672.      nfs41_session_sequence(&sequence_args, session, 1);
  673. @@ -621,7 +629,8 @@ int nfs41_create(
  674.  
  675.      nfs41_superblock_getattr_mask(parent->fh.superblock, &attr_request);
  676.  
  677. -    compound_init(&compound, argops, resops, "create");
  678. +    compound_init(&compound, session->client->root->nfsminorvers,
  679. +        argops, resops, "create");
  680.  
  681.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  682.      nfs41_session_sequence(&sequence_args, session, 1);
  683. @@ -709,7 +718,8 @@ int nfs41_close(
  684.  
  685.      nfs41_superblock_getattr_mask(file->fh.superblock, &attr_request);
  686.  
  687. -    compound_init(&compound, argops, resops, "close");
  688. +    compound_init(&compound, session->client->root->nfsminorvers,
  689. +        argops, resops, "close");
  690.  
  691.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  692.      nfs41_session_sequence(&sequence_args, session, 1);
  693. @@ -773,7 +783,8 @@ int nfs41_write(
  694.  
  695.      nfs41_superblock_getattr_mask(file->fh.superblock, &attr_request);
  696.  
  697. -    compound_init(&compound, argops, resops,
  698. +    compound_init(&compound, session->client->root->nfsminorvers,
  699. +        argops, resops,
  700.          stateid->stateid.seqid == 0 ? "ds write" : "write");
  701.  
  702.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  703. @@ -858,7 +869,8 @@ int nfs41_read(
  704.      nfs41_read_args read_args;
  705.      nfs41_read_res read_res;
  706.  
  707. -    compound_init(&compound, argops, resops,
  708. +    compound_init(&compound, session->client->root->nfsminorvers,
  709. +        argops, resops,
  710.          stateid->stateid.seqid == 0 ? "ds read" : "read");
  711.  
  712.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  713. @@ -920,7 +932,8 @@ int nfs41_commit(
  714.      bitmap4 attr_request;
  715.      nfs41_file_info info, *pinfo;
  716.  
  717. -    compound_init(&compound, argops, resops,
  718. +    compound_init(&compound, session->client->root->nfsminorvers,
  719. +        argops, resops,
  720.          do_getattr ? "commit" : "ds commit");
  721.  
  722.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  723. @@ -988,7 +1001,8 @@ int nfs41_lock(
  724.      nfs41_lock_args lock_args;
  725.      nfs41_lock_res lock_res;
  726.  
  727. -    compound_init(&compound, argops, resops, "lock");
  728. +    compound_init(&compound, session->client->root->nfsminorvers,
  729. +        argops, resops, "lock");
  730.  
  731.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  732.      nfs41_session_sequence(&sequence_args, session, 0);
  733. @@ -1046,7 +1060,8 @@ int nfs41_unlock(
  734.      nfs41_locku_args locku_args;
  735.      nfs41_locku_res locku_res;
  736.  
  737. -    compound_init(&compound, argops, resops, "unlock");
  738. +    compound_init(&compound, session->client->root->nfsminorvers,
  739. +        argops, resops, "unlock");
  740.  
  741.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  742.      nfs41_session_sequence(&sequence_args, session, 0);
  743. @@ -1092,7 +1107,8 @@ int nfs41_readdir(
  744.      nfs41_readdir_args readdir_args;
  745.      nfs41_readdir_res readdir_res;
  746.  
  747. -    compound_init(&compound, argops, resops, "readdir");
  748. +    compound_init(&compound, session->client->root->nfsminorvers,
  749. +        argops, resops, "readdir");
  750.  
  751.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  752.      nfs41_session_sequence(&sequence_args, session, 0);
  753. @@ -1142,7 +1158,8 @@ int nfs41_getattr(
  754.      nfs41_getattr_args getattr_args;
  755.      nfs41_getattr_res getattr_res NDSH(= { 0 });
  756.  
  757. -    compound_init(&compound, argops, resops, "getattr");
  758. +    compound_init(&compound, session->client->root->nfsminorvers,
  759. +        argops, resops, "getattr");
  760.  
  761.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  762.      nfs41_session_sequence(&sequence_args, session, 0);
  763. @@ -1202,7 +1219,8 @@ int nfs41_superblock_getattr(
  764.      nfs41_openattr_args openattr_args;
  765.      nfs41_openattr_res openattr_res;
  766.  
  767. -    compound_init(&compound, argops, resops, "getfsattr");
  768. +    compound_init(&compound, session->client->root->nfsminorvers,
  769. +        argops, resops, "getfsattr");
  770.  
  771.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  772.      nfs41_session_sequence(&sequence_args, session, 0);
  773. @@ -1269,7 +1287,8 @@ int nfs41_remove(
  774.  
  775.      nfs41_superblock_getattr_mask(parent->fh.superblock, &attr_request);
  776.  
  777. -    compound_init(&compound, argops, resops, "remove");
  778. +    compound_init(&compound, session->client->root->nfsminorvers,
  779. +        argops, resops, "remove");
  780.  
  781.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  782.      nfs41_session_sequence(&sequence_args, session, 1);
  783. @@ -1340,7 +1359,8 @@ int nfs41_rename(
  784.  
  785.      nfs41_superblock_getattr_mask(src_dir->fh.superblock, &attr_request);
  786.  
  787. -    compound_init(&compound, argops, resops, "rename");
  788. +    compound_init(&compound, session->client->root->nfsminorvers,
  789. +        argops, resops, "rename");
  790.  
  791.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  792.      nfs41_session_sequence(&sequence_args, session, 1);
  793. @@ -1434,7 +1454,8 @@ int nfs41_setattr(
  794.      nfs41_getattr_res getattr_res NDSH(= { 0 });
  795.      bitmap4 attr_request;
  796.  
  797. -    compound_init(&compound, argops, resops, "setattr");
  798. +    compound_init(&compound, session->client->root->nfsminorvers,
  799. +        argops, resops, "setattr");
  800.  
  801.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  802.      nfs41_session_sequence(&sequence_args, session, 0);
  803. @@ -1530,7 +1551,8 @@ int nfs41_link(
  804.      nfs41_superblock_getattr_mask(dst_dir->fh.superblock, &cinfo->attrmask);
  805.      cinfo->attrmask.arr[0] |= FATTR4_WORD0_FSID;
  806.  
  807. -    compound_init(&compound, argops, resops, "link");
  808. +    compound_init(&compound, session->client->root->nfsminorvers,
  809. +        argops, resops, "link");
  810.  
  811.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  812.      nfs41_session_sequence(&sequence_args, session, 1);
  813. @@ -1619,7 +1641,8 @@ int nfs41_readlink(
  814.      nfs41_putfh_res putfh_res;
  815.      nfs41_readlink_res readlink_res;
  816.  
  817. -    compound_init(&compound, argops, resops, "readlink");
  818. +    compound_init(&compound, session->client->root->nfsminorvers,
  819. +        argops, resops, "readlink");
  820.  
  821.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  822.      nfs41_session_sequence(&sequence_args, session, 0);
  823. @@ -1663,7 +1686,8 @@ int nfs41_access(
  824.      nfs41_access_args access_args;
  825.      nfs41_access_res access_res;
  826.  
  827. -    compound_init(&compound, argops, resops, "access");
  828. +    compound_init(&compound, session->client->root->nfsminorvers,
  829. +        argops, resops, "access");
  830.  
  831.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  832.      nfs41_session_sequence(&sequence_args, session, 0);
  833. @@ -1700,7 +1724,8 @@ int nfs41_send_sequence(
  834.      nfs41_sequence_args sequence_args;
  835.      nfs41_sequence_res sequence_res;
  836.  
  837. -    compound_init(&compound, argops, resops, "sequence");
  838. +    compound_init(&compound, session->client->root->nfsminorvers,
  839. +        argops, resops, "sequence");
  840.  
  841.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  842.      nfs41_session_sequence(&sequence_args, session, 0);
  843. @@ -1734,7 +1759,8 @@ enum nfsstat4 nfs41_want_delegation(
  844.      nfs41_want_delegation_args wd_args;
  845.      nfs41_want_delegation_res wd_res;
  846.  
  847. -    compound_init(&compound, argops, resops, "want_delegation");
  848. +    compound_init(&compound, session->client->root->nfsminorvers,
  849. +        argops, resops, "want_delegation");
  850.  
  851.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  852.      nfs41_session_sequence(&sequence_args, session, 0);
  853. @@ -1768,7 +1794,8 @@ int nfs41_delegpurge(
  854.      nfs41_sequence_res sequence_res;
  855.      nfs41_delegpurge_res dp_res;
  856.  
  857. -    compound_init(&compound, argops, resops, "delegpurge");
  858. +    compound_init(&compound, session->client->root->nfsminorvers,
  859. +        argops, resops, "delegpurge");
  860.  
  861.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  862.      nfs41_session_sequence(&sequence_args, session, 0);
  863. @@ -1801,7 +1828,8 @@ int nfs41_delegreturn(
  864.      nfs41_delegreturn_args dr_args;
  865.      nfs41_delegreturn_res dr_res;
  866.  
  867. -    compound_init(&compound, argops, resops, "delegreturn");
  868. +    compound_init(&compound, session->client->root->nfsminorvers,
  869. +        argops, resops, "delegreturn");
  870.  
  871.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  872.      nfs41_session_sequence(&sequence_args, session, 0);
  873. @@ -1849,7 +1877,8 @@ enum nfsstat4 nfs41_fs_locations(
  874.      bitmap4 attr_request = { .count=1, .arr[0]=FATTR4_WORD0_FS_LOCATIONS };
  875.      nfs41_file_info info;
  876.  
  877. -    compound_init(&compound, argops, resops, "fs_locations");
  878. +    compound_init(&compound, session->client->root->nfsminorvers,
  879. +        argops, resops, "fs_locations");
  880.  
  881.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  882.      nfs41_session_sequence(&sequence_args, session, 0);
  883. @@ -1893,7 +1922,8 @@ int nfs41_secinfo(
  884.      nfs41_secinfo_args secinfo_args;
  885.      nfs41_secinfo_no_name_res secinfo_res;
  886.  
  887. -    compound_init(&compound, argops, resops, "secinfo");
  888. +    compound_init(&compound, session->client->root->nfsminorvers,
  889. +        argops, resops, "secinfo");
  890.  
  891.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  892.      nfs41_session_sequence(&sequence_args, session, 0);
  893. @@ -1941,7 +1971,8 @@ int nfs41_secinfo_noname(
  894.      nfs41_secinfo_no_name_args noname_args;
  895.      nfs41_secinfo_no_name_res noname_res;
  896.  
  897. -    compound_init(&compound, argops, resops, "secinfo_no_name");
  898. +    compound_init(&compound, session->client->root->nfsminorvers,
  899. +        argops, resops, "secinfo_no_name");
  900.  
  901.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  902.      nfs41_session_sequence(&sequence_args, session, 0);
  903. @@ -1986,7 +2017,8 @@ enum nfsstat4 nfs41_free_stateid(
  904.      nfs41_free_stateid_args freestateid_args;
  905.      nfs41_free_stateid_res freestateid_res;
  906.  
  907. -    compound_init(&compound, argops, resops, "free_stateid");
  908. +    compound_init(&compound, session->client->root->nfsminorvers,
  909. +        argops, resops, "free_stateid");
  910.  
  911.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  912.      nfs41_session_sequence(&sequence_args, session, 0);
  913. @@ -2018,7 +2050,8 @@ enum nfsstat4 nfs41_test_stateid(
  914.      nfs41_test_stateid_args teststateid_args;
  915.      nfs41_test_stateid_res teststateid_res;
  916.  
  917. -    compound_init(&compound, argops, resops, "test_stateid");
  918. +    compound_init(&compound, session->client->root->nfsminorvers,
  919. +        argops, resops, "test_stateid");
  920.  
  921.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  922.      nfs41_session_sequence(&sequence_args, session, 0);
  923. @@ -2061,7 +2094,8 @@ enum nfsstat4 pnfs_rpc_layoutget(
  924.      uint32_t i;
  925.      struct list_entry *entry;
  926.  
  927. -    compound_init(&compound, argops, resops, "layoutget");
  928. +    compound_init(&compound, session->client->root->nfsminorvers,
  929. +        argops, resops, "layoutget");
  930.  
  931.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  932.      nfs41_session_sequence(&sequence_args, session, 0);
  933. @@ -2128,7 +2162,8 @@ enum nfsstat4 pnfs_rpc_layoutcommit(
  934.  
  935.      nfs41_superblock_getattr_mask(file->fh.superblock, &attr_request);
  936.  
  937. -    compound_init(&compound, argops, resops, "layoutcommit");
  938. +    compound_init(&compound, session->client->root->nfsminorvers,
  939. +        argops, resops, "layoutcommit");
  940.  
  941.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  942.      nfs41_session_sequence(&sequence_args, session, 0);
  943. @@ -2184,7 +2219,8 @@ enum nfsstat4 pnfs_rpc_layoutreturn(
  944.      nfs41_putfh_res putfh_res;
  945.      pnfs_layoutreturn_args layoutreturn_args;
  946.  
  947. -    compound_init(&compound, argops, resops, "layoutreturn");
  948. +    compound_init(&compound, session->client->root->nfsminorvers,
  949. +        argops, resops, "layoutreturn");
  950.  
  951.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  952.      nfs41_session_sequence(&sequence_args, session, 0);
  953. @@ -2225,7 +2261,8 @@ enum nfsstat4 pnfs_rpc_getdeviceinfo(
  954.      pnfs_getdeviceinfo_args getdeviceinfo_args;
  955.      pnfs_getdeviceinfo_res getdeviceinfo_res;
  956.  
  957. -    compound_init(&compound, argops, resops, "get_deviceinfo");
  958. +    compound_init(&compound, session->client->root->nfsminorvers,
  959. +        argops, resops, "get_deviceinfo");
  960.  
  961.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  962.      nfs41_session_sequence(&sequence_args, session, 0);
  963. @@ -2265,7 +2302,8 @@ enum nfsstat4 nfs41_rpc_openattr(
  964.      nfs41_openattr_res openattr_res;
  965.      nfs41_getfh_res getfh_res;
  966.  
  967. -    compound_init(&compound, argops, resops, "openattr");
  968. +    compound_init(&compound, session->client->root->nfsminorvers,
  969. +        argops, resops, "openattr");
  970.  
  971.      compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  972.      nfs41_session_sequence(&sequence_args, session, 0);
  973. diff --git a/daemon/nfs41_ops.h b/daemon/nfs41_ops.h
  974. index 8ac81a3..81bad50 100644
  975. --- a/daemon/nfs41_ops.h
  976. +++ b/daemon/nfs41_ops.h
  977. @@ -86,6 +86,28 @@ enum nfs_opnum4 {
  978.      OP_WANT_DELEGATION      = 56,
  979.      OP_DESTROY_CLIENTID     = 57,
  980.      OP_RECLAIM_COMPLETE     = 58,
  981. +
  982. +    /* new operations for NFSv4.2 */
  983. +    OP_ALLOCATE             = 59,
  984. +    OP_COPY                 = 60,
  985. +    OP_COPY_NOTIFY          = 61,
  986. +    OP_DEALLOCATE           = 62,
  987. +    OP_IO_ADVISE            = 63,
  988. +    OP_LAYOUTERROR          = 64,
  989. +    OP_LAYOUTSTATS          = 65,
  990. +    OP_OFFLOAD_CANCEL       = 66,
  991. +    OP_OFFLOAD_STATUS       = 67,
  992. +    OP_READ_PLUS            = 68,
  993. +    OP_SEEK                 = 69,
  994. +    OP_WRITE_SAME           = 70,
  995. +    OP_CLONE                = 71,
  996. +
  997. +    /* xattr support (RFC8726) */
  998. +    OP_GETXATTR             = 72,
  999. +    OP_SETXATTR             = 73,
  1000. +    OP_LISTXATTRS           = 74,
  1001. +    OP_REMOVEXATTR          = 75,
  1002. +
  1003.      OP_ILLEGAL              = 10044
  1004.  };
  1005.  
  1006. @@ -1001,6 +1023,7 @@ typedef struct __pnfs_getdeviceinfo_res {
  1007.  /* nfs41_ops.c */
  1008.  int nfs41_exchange_id(
  1009.      IN nfs41_rpc_clnt *rpc,
  1010. +    IN int nfsminorvers,
  1011.      IN client_owner4 *owner,
  1012.      IN uint32_t flags_in,
  1013.      OUT nfs41_exchange_id_res *res_out);
  1014. diff --git a/daemon/nfs41_xdr.c b/daemon/nfs41_xdr.c
  1015. index 2385e5d..0004138 100644
  1016. --- a/daemon/nfs41_xdr.c
  1017. +++ b/daemon/nfs41_xdr.c
  1018. @@ -3624,6 +3624,27 @@ static const op_table_entry g_op_table[] = {
  1019.      { encode_op_want_delegation, decode_op_want_delegation }, /* OP_WANT_DELEGATION = 56 */
  1020.      { encode_op_destroy_clientid, decode_op_destroy_clientid }, /* OP_DESTROY_CLIENTID = 57 */
  1021.      { encode_op_reclaim_complete, decode_op_reclaim_complete }, /* OP_RECLAIM_COMPLETE = 58 */
  1022. +
  1023. +    /* new operations for NFSv4.2 */
  1024. +    { NULL, NULL }, /* OP_ALLOCATE = 59, */
  1025. +    { NULL, NULL }, /* OP_COPY = 60, */
  1026. +    { NULL, NULL }, /* OP_COPY_NOTIFY = 61, */
  1027. +    { NULL, NULL }, /* OP_DEALLOCATE = 62, */
  1028. +    { NULL, NULL }, /* OP_IO_ADVISE = 63, */
  1029. +    { NULL, NULL }, /* OP_LAYOUTERROR = 64, */
  1030. +    { NULL, NULL }, /* OP_LAYOUTSTATS = 65, */
  1031. +    { NULL, NULL }, /* OP_OFFLOAD_CANCEL = 66, */
  1032. +    { NULL, NULL }, /* OP_OFFLOAD_STATUS = 67, */
  1033. +    { NULL, NULL }, /* OP_READ_PLUS = 68, */
  1034. +    { NULL, NULL }, /* OP_SEEK = 69, */
  1035. +    { NULL, NULL }, /* OP_WRITE_SAME = 70, */
  1036. +    { NULL, NULL }, /* OP_CLONE = 71, */
  1037. +
  1038. +    /* xattr support (RFC8726) */
  1039. +    { NULL, NULL }, /* OP_GETXATTR = 72, */
  1040. +    { NULL, NULL }, /* OP_SETXATTR = 73, */
  1041. +    { NULL, NULL }, /* OP_LISTXATTRS = 74, */
  1042. +    { NULL, NULL }, /* OP_REMOVEXATTR = 75, */
  1043.  };
  1044.  static const uint32_t g_op_table_size = ARRAYSIZE(g_op_table);
  1045.  
  1046. diff --git a/daemon/service.h b/daemon/service.h
  1047. index ab60e39..c3dc443 100644
  1048. --- a/daemon/service.h
  1049. +++ b/daemon/service.h
  1050. @@ -66,7 +66,7 @@ extern "C" {
  1051.  // internal name of the service
  1052.  #define SZSERVICENAME        "pnfs"
  1053.  // displayed name of the service
  1054. -#define SZSERVICEDISPLAYNAME "NFSv4.1 Client"
  1055. +#define SZSERVICEDISPLAYNAME "NFSv4.2 Client"
  1056.  // list of service dependencies - "dep1\0dep2\0\0"
  1057.  #define SZDEPENDENCIES       ""
  1058.  //////////////////////////////////////////////////////////////////////////////
  1059. diff --git a/daemon/upcall.h b/daemon/upcall.h
  1060. index f6ac12d..5f44ede 100644
  1061. --- a/daemon/upcall.h
  1062. +++ b/daemon/upcall.h
  1063. @@ -37,6 +37,7 @@ typedef struct __mount_upcall_args {
  1064.      DWORD       rsize;
  1065.      DWORD       wsize;
  1066.      DWORD       use_nfspubfh;
  1067. +    DWORD       nfsvers;
  1068.      DWORD       lease_time;
  1069.      FILE_FS_ATTRIBUTE_INFORMATION FsAttrs;
  1070.  } mount_upcall_args;
  1071. diff --git a/mount/mount.c b/mount/mount.c
  1072. index c9b5637..2ebf8e5 100644
  1073. --- a/mount/mount.c
  1074. +++ b/mount/mount.c
  1075. @@ -129,6 +129,9 @@ void PrintMountUsage(LPWSTR pProcess)
  1076.          "\tro\tmount as read-only\n"
  1077.          "\trw\tmount as read-write (default)\n"
  1078.          "\tport=#\tTCP port to use (defaults to 2049)\n"
  1079. +        "\tvers=#\tNFS protocol version, either 4.1 or 4.2\n"
  1080. +            "\t\tIf this option is not specified, the client negotiates a\n"
  1081. +            "\t\tsuitable version with the server, trying version 4.2 and then 4.1\n"
  1082.          "\trsize=#\tread buffer size in bytes\n"
  1083.          "\twsize=#\twrite buffer size in bytes\n"
  1084.          "\tsec=sys:krb5:krb5i:krb5p\tspecify (gss) security flavor\n"
  1085. diff --git a/sys/nfs41_driver.h b/sys/nfs41_driver.h
  1086. index c08e8fb..7d933f0 100644
  1087. --- a/sys/nfs41_driver.h
  1088. +++ b/sys/nfs41_driver.h
  1089. @@ -104,4 +104,12 @@ typedef enum _nfs41_start_driver_state {
  1090.     NFS41_START_DRIVER_STARTED,
  1091.     NFS41_START_DRIVER_STOPPED
  1092.  } nfs41_start_driver_state;
  1093. +
  1094. +#define NFS_VERSION_AUTONEGOTIATION (0xFFFF)
  1095. +
  1096. +/*
  1097. + * Error/Status codes
  1098. + */
  1099. +#define ERROR_NFS_VERSION_MISMATCH ERROR_REMOTE_FILE_VERSION_MISMATCH
  1100. +#define STATUS_NFS_VERSION_MISMATCH STATUS_REMOTE_FILE_VERSION_MISMATCH
  1101.  #endif
  1102. diff --git a/sys/nfs41sys_driver.h b/sys/nfs41sys_driver.h
  1103. index 0e0107c..79ef82c 100644
  1104. --- a/sys/nfs41sys_driver.h
  1105. +++ b/sys/nfs41sys_driver.h
  1106. @@ -208,6 +208,7 @@ typedef struct _updowncall_entry {
  1107.              DWORD wsize;
  1108.              DWORD lease_time;
  1109.              DWORD use_nfspubfh;
  1110. +            DWORD nfsvers;
  1111.          } Mount;
  1112.          struct {
  1113.              PMDL MdlAddress;
  1114. @@ -308,6 +309,7 @@ typedef struct _NFS41_MOUNT_CREATEMODE {
  1115.  
  1116.  typedef struct _NFS41_MOUNT_CONFIG {
  1117.      BOOLEAN use_nfspubfh;
  1118. +    DWORD nfsvers;
  1119.      DWORD ReadSize;
  1120.      DWORD WriteSize;
  1121.      BOOLEAN ReadOnly;
  1122. @@ -415,6 +417,7 @@ typedef struct _NFS41_V_NET_ROOT_EXTENSION {
  1123.      NFS41_MOUNT_CREATEMODE  dir_createmode;
  1124.      NFS41_MOUNT_CREATEMODE  file_createmode;
  1125.      USHORT                  MountPathLen;
  1126. +    DWORD                   nfsvers;
  1127.      BOOLEAN                 read_only;
  1128.      BOOLEAN                 write_thru;
  1129.      BOOLEAN                 nocache;
  1130. diff --git a/sys/nfs41sys_mount.c b/sys/nfs41sys_mount.c
  1131. index 8cc45f4..93a6d34 100644
  1132. --- a/sys/nfs41sys_mount.c
  1133. +++ b/sys/nfs41sys_mount.c
  1134. @@ -112,7 +112,7 @@ NTSTATUS marshal_nfs41_mount(
  1135.          goto out;
  1136.      }
  1137.      header_len = *len + length_as_utf8(entry->u.Mount.srv_name) +
  1138. -        length_as_utf8(entry->u.Mount.root) + 4 * sizeof(DWORD);
  1139. +        length_as_utf8(entry->u.Mount.root) + 5 * sizeof(DWORD);
  1140.      if (header_len > buf_len) {
  1141.          status = STATUS_INSUFFICIENT_RESOURCES;
  1142.          goto out;
  1143. @@ -128,16 +128,20 @@ NTSTATUS marshal_nfs41_mount(
  1144.      RtlCopyMemory(tmp, &entry->u.Mount.wsize, sizeof(DWORD));
  1145.      tmp += sizeof(DWORD);
  1146.      RtlCopyMemory(tmp, &entry->u.Mount.use_nfspubfh, sizeof(DWORD));
  1147. +    tmp += sizeof(DWORD);
  1148. +    RtlCopyMemory(tmp, &entry->u.Mount.nfsvers, sizeof(DWORD));
  1149.  
  1150.      *len = header_len;
  1151.  
  1152.  #ifdef DEBUG_MARSHAL_DETAIL
  1153.      DbgP("marshal_nfs41_mount: server name='%wZ' mount point='%wZ' "
  1154. -         "sec_flavor='%s' rsize=%d wsize=%d use_nfspubfh=%d\n",
  1155. +         "sec_flavor='%s' rsize=%d wsize=%d use_nfspubfh=%d "
  1156. +         "nfsvers=%d\n",
  1157.          entry->u.Mount.srv_name, entry->u.Mount.root,
  1158.           secflavorop2name(entry->u.Mount.sec_flavor),
  1159.           (int)entry->u.Mount.rsize, (int)entry->u.Mount.wsize,
  1160. -         (int)entry->u.Mount.use_nfspubfh);
  1161. +         (int)entry->u.Mount.use_nfspubfh,
  1162. +         (int)entry->u.Mount.nfsvers);
  1163.  #endif
  1164.  out:
  1165.      return status;
  1166. @@ -227,6 +231,7 @@ NTSTATUS map_mount_errors(
  1167.      case ERROR_BAD_NET_NAME:    return STATUS_BAD_NETWORK_NAME;
  1168.      case ERROR_BAD_NETPATH:     return STATUS_BAD_NETWORK_PATH;
  1169.      case ERROR_NOT_SUPPORTED:   return STATUS_NOT_SUPPORTED;
  1170. +    case ERROR_NFS_VERSION_MISMATCH: return STATUS_NFS_VERSION_MISMATCH;
  1171.      case ERROR_INTERNAL_ERROR:  return STATUS_INTERNAL_ERROR;
  1172.      default:
  1173.          print_error("map_mount_errors: "
  1174. @@ -261,6 +266,7 @@ NTSTATUS nfs41_mount(
  1175.      entry->u.Mount.rsize = config->ReadSize;
  1176.      entry->u.Mount.wsize = config->WriteSize;
  1177.      entry->u.Mount.use_nfspubfh = config->use_nfspubfh;
  1178. +    entry->u.Mount.nfsvers = config->nfsvers;
  1179.      entry->u.Mount.sec_flavor = sec_flavor;
  1180.      entry->u.Mount.FsAttrs = FsAttrs;
  1181.  
  1182. @@ -295,6 +301,7 @@ void nfs41_MountConfig_InitDefaults(
  1183.      Config->ReadSize = MOUNT_CONFIG_RW_SIZE_DEFAULT;
  1184.      Config->WriteSize = MOUNT_CONFIG_RW_SIZE_DEFAULT;
  1185.      Config->use_nfspubfh = FALSE;
  1186. +    Config->nfsvers = NFS_VERSION_AUTONEGOTIATION;
  1187.      Config->ReadOnly = FALSE;
  1188.      Config->write_thru = FALSE;
  1189.      Config->nocache = FALSE;
  1190. @@ -484,6 +491,16 @@ NTSTATUS nfs41_MountConfig_ParseOptions(
  1191.                  &Config->WriteSize, MOUNT_CONFIG_RW_SIZE_MIN,
  1192.                  MOUNT_CONFIG_RW_SIZE_MAX);
  1193.          }
  1194. +        else if (wcsncmp(L"vers", Name, NameLen) == 0) {
  1195. +            if (wcsncmp(L"4.2", usValue.Buffer, usValue.Length) == 0)
  1196. +                Config->nfsvers = 42;
  1197. +            else if (wcsncmp(L"4.1", usValue.Buffer, usValue.Length) == 0)
  1198. +                Config->nfsvers = 41;
  1199. +            else {
  1200. +                status = STATUS_INVALID_PARAMETER;
  1201. +                print_error("Invalid vers= string\n");
  1202. +            }
  1203. +        }
  1204.          else if (wcsncmp(L"public", Name, NameLen) == 0) {
  1205.              /*
  1206.               + We ignore this value here, and instead rely on the
  1207. @@ -874,6 +891,8 @@ NTSTATUS nfs41_CreateVNetRoot(
  1208.              DbgP("nfs41_MountConfig_ParseOptions() failed\n");
  1209.              goto out_free;
  1210.          }
  1211. +
  1212. +        pVNetRootContext->nfsvers = Config->nfsvers;
  1213.          pVNetRootContext->read_only = Config->ReadOnly;
  1214.          pVNetRootContext->write_thru = Config->write_thru;
  1215.          pVNetRootContext->nocache = Config->nocache;
  1216. @@ -996,6 +1015,7 @@ NTSTATUS nfs41_CreateVNetRoot(
  1217.              goto out_free;
  1218.          }
  1219.  
  1220. +        pVNetRootContext->nfsvers = Config->nfsvers;
  1221.          pVNetRootContext->read_only = Config->ReadOnly;
  1222.          pVNetRootContext->write_thru = Config->write_thru;
  1223.          pVNetRootContext->nocache = Config->nocache;
  1224. @@ -1008,6 +1028,7 @@ NTSTATUS nfs41_CreateVNetRoot(
  1225.          "MntPt='%wZ', "
  1226.          "SrvName='%wZ', "
  1227.          "usenfspubfh=%d, "
  1228. +        "nfsvers=%d, "
  1229.          "ro=%d, "
  1230.          "writethru=%d, "
  1231.          "nocache=%d "
  1232. @@ -1019,6 +1040,7 @@ NTSTATUS nfs41_CreateVNetRoot(
  1233.          &Config->MntPt,
  1234.          &Config->SrvName,
  1235.          Config->use_nfspubfh?1:0,
  1236. +        (int)Config->nfsvers,
  1237.          Config->ReadOnly?1:0,
  1238.          Config->write_thru?1:0,
  1239.          Config->nocache?1:0,
  1240. diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt
  1241. index 6ee7186..3f5b115 100644
  1242. --- a/tests/manual_testing.txt
  1243. +++ b/tests/manual_testing.txt
  1244. @@ -1,5 +1,5 @@
  1245.  #
  1246. -# ms-nfs41-client manual testing sequence, 2024-12-19
  1247. +# ms-nfs41-client manual testing sequence, 2025-01-08
  1248.  #
  1249.  # Draft version, needs to be turned into automated tests
  1250.  # if possible
  1251. @@ -94,8 +94,8 @@
  1252.  #   regtool -i set '/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows/CurrentVersion/Policies/DataCollection/AllowTelemetry' 0
  1253.  #   ---- snip ----
  1254.  #
  1255. -# - A timeserver shoud be running on both Windows (NFSv4.1 client and
  1256. -#   NFSv4.1 server).
  1257. +# - A timeserver shoud be running on both Windows (NFSv4.2/NFSv4.1
  1258. +#   client and NFSv4.2/NFSv4.1 server).
  1259.  #   For example on Windows add timeserver 10.49.0.6 like this:
  1260.  #   ---- snip ----
  1261.  #   sc config w32time start=auto
  1262. @@ -196,7 +196,7 @@ root@DERFWNB4966:~# usermod -a -G cygwingrp2 roland_mainz
  1263.  #
  1264.  Testcase:
  1265.  -------- snip --------
  1266. -# cd to a NFSv4.1 filesystem
  1267. +# cd to a NFS >= v4.1 filesystem
  1268.  $ rm -f test1.txt
  1269.  $ touch test1.txt
  1270.  $ icacls test1.txt /grant:r 'cygwingrp1:(WDAC)' /t /c
  1271. @@ -220,7 +220,7 @@ other::r--
  1272.  
  1273.  or one-liner:
  1274.  -------- snip --------
  1275. -# cd to a NFSv4.1 filesystem
  1276. +# cd to a NFS >= v4.1 filesystem
  1277.  # getfact output should contain both "cygwingrp1" and "cygwingrp2"
  1278.  ksh93 -c 'rm -f test1.txt ; touch test1.txt ; icacls test1.txt /grant:r "cygwingrp1:(WDAC)" /grant:r "cygwingrp2:(WDAC)" /t /c ; getfacl test1.txt | grep -C 20 --colour -E "cygwingrp[12]"'
  1279.  -------- snip --------
  1280. @@ -244,7 +244,7 @@ icacls mytestfile1.txt | grep --colour -E 'cygwingrp2.+GR'
  1281.  
  1282.  #
  1283.  # Compile each of the following package
  1284. -# on a NFSv4.1 share, and run each build in parallel/sequence
  1285. +# on a NFS >= v4.1 share, and run each build in parallel/sequence
  1286.  # multiple times on one or multiple mounts
  1287.  #
  1288.  # ./nfs_mount -p -o sec=sys T derfwnb4966_ipv6:/net_tmpfs2
  1289. @@ -364,7 +364,7 @@ make -j8 all
  1290.  
  1291.  
  1292.  #
  1293. -# Run Cygwin installer from NFSv4.1 share
  1294. +# Run Cygwin installer from NFS >= v4.1 share
  1295.  #
  1296.  wget 'https://www.cygwin.com/setup-x86_64.exe'
  1297.  chmod a+rx setup-x86_64.exe
  1298. @@ -440,21 +440,21 @@ svn checkout https://svn.FreeBSD.org/base/head/share/man
  1299.  
  1300.  
  1301.  #
  1302. -# Run parallel make job on NFSv4.1 filesystem (/cygdrive/n/xxx/)
  1303. +# Run parallel make job on NFS >= v4.1 filesystem (/cygdrive/n/xxx/)
  1304.  #
  1305.  cd /cygdrive/n/xxx/
  1306.  time ksh93 $msnfs41clientgitroot/tests/fstest_make_numtree1/fstest_make_numtree1.ksh93 all
  1307.  
  1308.  
  1309.  #
  1310. -# Run DrMemory with log dir on NFSv4.1 filesystem
  1311. +# Run DrMemory with log dir on NFS >= v4.1 filesystem
  1312.  #
  1313.  cd /cygdrive/n/xxx/
  1314.  drmemory -batch -check_uninit_all -strict_bitops -logdir "$(cygpath -w "$PWD")" -- "$(cygpath -w /sbin/nfs_mount)"
  1315.  
  1316.  #
  1317.  # Run Windows tar (/cygdrive/c/Windows/system32/tar) tests
  1318. -# on NFSv4.1 filesystem
  1319. +# on NFS >= v4.1 filesystem
  1320.  #
  1321.  # Notes:
  1322.  # - Win10 /cygdrive/c/Windows/system32/tar uses write-only handles
  1323. diff --git a/tests/nfs_server_setup.txt b/tests/nfs_server_setup.txt
  1324. index 68836e8..9f3a2a3 100644
  1325. --- a/tests/nfs_server_setup.txt
  1326. +++ b/tests/nfs_server_setup.txt
  1327. @@ -1,10 +1,10 @@
  1328.  #
  1329. -# NFSv4.1 server setup for testing
  1330. +# NFSv4.2/NFSv4.1 server setup for testing
  1331.  #
  1332.  
  1333.  #
  1334.  # TODO:
  1335. -# - Debian Linux NFSv4.1 server setup
  1336. +# - Debian Linux NFSv4.2 server setup
  1337.  # - Solaris 11.4 NFSv4.1 server setup
  1338.  # - Illumos 11.4 NFSv4.1 server setup
  1339.  # - FreeBSD NFSv4.1 server setup
  1340. --
  1341. 2.45.1
  1342.  
  1343. From 1b489cf00e6c04e1edb8968f00cd2db5e66deeb0 Mon Sep 17 00:00:00 2001
  1344. From: Roland Mainz <roland.mainz@nrubsig.org>
  1345. Date: Wed, 8 Jan 2025 12:01:29 +0100
  1346. Subject: [PATCH 03/44] daemon: Remove unnecessary |ZeroMemory()| from
  1347.  |compound_init()|
  1348.  
  1349. Remove unnecessary |ZeroMemory()| from |compound_init()|
  1350.  
  1351. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1352. ---
  1353. daemon/nfs41_compound.c | 3 ++-
  1354.  1 file changed, 2 insertions(+), 1 deletion(-)
  1355.  
  1356. diff --git a/daemon/nfs41_compound.c b/daemon/nfs41_compound.c
  1357. index ecee929..cb35663 100644
  1358. --- a/daemon/nfs41_compound.c
  1359. +++ b/daemon/nfs41_compound.c
  1360. @@ -53,7 +53,8 @@ void compound_init(
  1361.      compound->args.argarray = argops;
  1362.  
  1363.      /* initialize results */
  1364. -    ZeroMemory(&compound->res, sizeof(nfs41_compound_res));
  1365. +    compound->res.status = 0;
  1366. +    compound->res.tag[0] = '\0';
  1367.      compound->res.tag_len = NFS4_OPAQUE_LIMIT;
  1368.      compound->res.resarray_count = 0;
  1369.      compound->res.resarray = resops;
  1370. --
  1371. 2.45.1
  1372.  
  1373. From 1dde35a6521b22633fa8c04c85e43810fe904484 Mon Sep 17 00:00:00 2001
  1374. From: Roland Mainz <roland.mainz@nrubsig.org>
  1375. Date: Wed, 8 Jan 2025 12:16:40 +0100
  1376. Subject: [PATCH 04/44] cygwin: msnfs41client "require_file" uses the wrong
  1377.  file name
  1378.  
  1379. msnfs41client "require_file" uses the wrong file name for error
  1380. messages.
  1381.  
  1382. Reported-by: Dan Shelton <dan.f.shelton@gmail.com>
  1383. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1384. ---
  1385. cygwin/devel/msnfs41client.bash | 2 +-
  1386.  1 file changed, 1 insertion(+), 1 deletion(-)
  1387.  
  1388. diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash
  1389. index 111b328..cff5cc2 100755
  1390. --- a/cygwin/devel/msnfs41client.bash
  1391. +++ b/cygwin/devel/msnfs41client.bash
  1392. @@ -745,7 +745,7 @@ function require_file
  1393.         typeset testfile="$1"
  1394.  
  1395.         if [[ ! -f "$testfile" ]] ; then
  1396. -               printf $"%s: File %q not found in %q\n" "$0" "$cmd" "$PWD" 1>&2
  1397. +               printf $"%s: File %q not found in %q\n" "$0" "$testfile" "$PWD" 1>&2
  1398.                 return 1
  1399.         fi
  1400.         return 0
  1401. --
  1402. 2.45.1
  1403.  
  1404. From 923fa90cfb5ae8dbed27cb846b2b98c72a476b48 Mon Sep 17 00:00:00 2001
  1405. From: Roland Mainz <roland.mainz@nrubsig.org>
  1406. Date: Wed, 8 Jan 2025 13:27:00 +0100
  1407. Subject: [PATCH 05/44] build.vc19,sys,include: Move sys/nfs41_driver.h to
  1408.  include/nfs41_driver.h
  1409.  
  1410. Move sys/nfs41_driver.h to include/nfs41_driver.h
  1411.  
  1412. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1413. ---
  1414. build.vc19/nfs41_np/nfs41_np.vcxproj   | 12 ++++++------
  1415.  build.vc19/nfs_mount/nfs_mount.vcxproj | 12 ++++++------
  1416.  build.vc19/nfsd/nfsd.vcxproj           | 12 ++++++------
  1417.  {sys => include}/nfs41_driver.h        |  0
  1418.  4 files changed, 18 insertions(+), 18 deletions(-)
  1419.  rename {sys => include}/nfs41_driver.h (100%)
  1420.  
  1421. diff --git a/build.vc19/nfs41_np/nfs41_np.vcxproj b/build.vc19/nfs41_np/nfs41_np.vcxproj
  1422. index e07ccfc..c61e65a 100644
  1423. --- a/build.vc19/nfs41_np/nfs41_np.vcxproj
  1424. +++ b/build.vc19/nfs41_np/nfs41_np.vcxproj
  1425. @@ -121,7 +121,7 @@
  1426.        <WarningLevel>Level4</WarningLevel>
  1427.        <Optimization>Disabled</Optimization>
  1428.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1429. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1430. +      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1431.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1432.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  1433.        <AdditionalOptions>/wd4100</AdditionalOptions>
  1434. @@ -140,7 +140,7 @@
  1435.        <WarningLevel>Level4</WarningLevel>
  1436.        <Optimization>Disabled</Optimization>
  1437.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1438. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1439. +      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1440.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1441.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  1442.        <AdditionalOptions>/wd4100</AdditionalOptions>
  1443. @@ -159,7 +159,7 @@
  1444.        <WarningLevel>Level4</WarningLevel>
  1445.        <Optimization>Disabled</Optimization>
  1446.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1447. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1448. +      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1449.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1450.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  1451.        <AdditionalOptions>/wd4100</AdditionalOptions>
  1452. @@ -180,7 +180,7 @@
  1453.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1454.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1455.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1456. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1457. +      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1458.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1459.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  1460.        <AdditionalOptions>/wd4100</AdditionalOptions>
  1461. @@ -202,7 +202,7 @@
  1462.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1463.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1464.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1465. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1466. +      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1467.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1468.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  1469.        <AdditionalOptions>/wd4100</AdditionalOptions>
  1470. @@ -224,7 +224,7 @@
  1471.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1472.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1473.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1474. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1475. +      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1476.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1477.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  1478.        <AdditionalOptions>/wd4100</AdditionalOptions>
  1479. diff --git a/build.vc19/nfs_mount/nfs_mount.vcxproj b/build.vc19/nfs_mount/nfs_mount.vcxproj
  1480. index c85ab61..399d150 100644
  1481. --- a/build.vc19/nfs_mount/nfs_mount.vcxproj
  1482. +++ b/build.vc19/nfs_mount/nfs_mount.vcxproj
  1483. @@ -137,7 +137,7 @@
  1484.        <WarningLevel>Level4</WarningLevel>
  1485.        <Optimization>Disabled</Optimization>
  1486.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1487. -      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1488. +      <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1489.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1490.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  1491.        <SupportJustMyCode>false</SupportJustMyCode>
  1492. @@ -155,7 +155,7 @@
  1493.        <WarningLevel>Level4</WarningLevel>
  1494.        <Optimization>Disabled</Optimization>
  1495.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1496. -      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1497. +      <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1498.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1499.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  1500.        <SupportJustMyCode>false</SupportJustMyCode>
  1501. @@ -173,7 +173,7 @@
  1502.        <WarningLevel>Level4</WarningLevel>
  1503.        <Optimization>Disabled</Optimization>
  1504.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1505. -      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1506. +      <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1507.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1508.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  1509.        <SupportJustMyCode>false</SupportJustMyCode>
  1510. @@ -193,7 +193,7 @@
  1511.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1512.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1513.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1514. -      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1515. +      <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1516.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1517.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  1518.      </ClCompile>
  1519. @@ -214,7 +214,7 @@
  1520.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1521.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1522.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1523. -      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1524. +      <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1525.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1526.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  1527.      </ClCompile>
  1528. @@ -235,7 +235,7 @@
  1529.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1530.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1531.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1532. -      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1533. +      <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1534.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1535.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  1536.      </ClCompile>
  1537. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  1538. index 43d07f7..6c1d743 100644
  1539. --- a/build.vc19/nfsd/nfsd.vcxproj
  1540. +++ b/build.vc19/nfsd/nfsd.vcxproj
  1541. @@ -137,7 +137,7 @@
  1542.        <WarningLevel>Level4</WarningLevel>
  1543.        <Optimization>Disabled</Optimization>
  1544.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1545. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1546. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1547.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1548.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  1549.        <BufferSecurityCheck>false</BufferSecurityCheck>
  1550. @@ -159,7 +159,7 @@
  1551.        <WarningLevel>Level4</WarningLevel>
  1552.        <Optimization>Disabled</Optimization>
  1553.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1554. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1555. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1556.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1557.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  1558.        <BufferSecurityCheck>false</BufferSecurityCheck>
  1559. @@ -181,7 +181,7 @@
  1560.        <WarningLevel>Level4</WarningLevel>
  1561.        <Optimization>Disabled</Optimization>
  1562.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1563. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1564. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1565.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1566.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  1567.        <BufferSecurityCheck>false</BufferSecurityCheck>
  1568. @@ -205,7 +205,7 @@
  1569.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1570.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1571.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1572. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1573. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1574.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1575.        <BufferSecurityCheck>false</BufferSecurityCheck>
  1576.        <StringPooling>true</StringPooling>
  1577. @@ -229,7 +229,7 @@
  1578.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1579.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1580.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1581. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1582. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1583.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1584.        <BufferSecurityCheck>false</BufferSecurityCheck>
  1585.        <StringPooling>true</StringPooling>
  1586. @@ -253,7 +253,7 @@
  1587.        <FunctionLevelLinking>true</FunctionLevelLinking>
  1588.        <IntrinsicFunctions>true</IntrinsicFunctions>
  1589.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  1590. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1591. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  1592.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  1593.        <BufferSecurityCheck>false</BufferSecurityCheck>
  1594.        <StringPooling>true</StringPooling>
  1595. diff --git a/sys/nfs41_driver.h b/include/nfs41_driver.h
  1596. similarity index 100%
  1597. rename from sys/nfs41_driver.h
  1598. rename to include/nfs41_driver.h
  1599. --
  1600. 2.45.1
  1601.  
  1602. From f256e74641db9dc893431c7d4c2302cefac2b861 Mon Sep 17 00:00:00 2001
  1603. From: Roland Mainz <roland.mainz@nrubsig.org>
  1604. Date: Thu, 9 Jan 2025 11:39:49 +0100
  1605. Subject: [PATCH 06/44] build.vc19: Reformat XML used for generating
  1606.  git_version.h in VS19's preferred style
  1607.  
  1608. Reformat XML used for generating git_version.h in VS19's preferred style
  1609.  
  1610. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1611. ---
  1612. build.vc19/nfs_mount/nfs_mount.vcxproj | 14 ++------------
  1613.  build.vc19/nfsd/nfsd.vcxproj           | 14 ++------------
  1614.  2 files changed, 4 insertions(+), 24 deletions(-)
  1615.  
  1616. diff --git a/build.vc19/nfs_mount/nfs_mount.vcxproj b/build.vc19/nfs_mount/nfs_mount.vcxproj
  1617. index 399d150..63ccec7 100644
  1618. --- a/build.vc19/nfs_mount/nfs_mount.vcxproj
  1619. +++ b/build.vc19/nfs_mount/nfs_mount.vcxproj
  1620. @@ -1,20 +1,10 @@
  1621. <?xml version="1.0" encoding="utf-8"?>
  1622.  <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  1623.    <Target Name="generate_git_version_header" BeforeTargets="ClCompile">
  1624. -    <Exec
  1625. -      Command="git describe --long --always --dirty --exclude=* --abbrev=8"
  1626. -      ConsoleToMSBuild="True"
  1627. -      IgnoreExitCode="False">
  1628. +    <Exec Command="git describe --long --always --dirty --exclude=* --abbrev=8" ConsoleToMSBuild="True" IgnoreExitCode="False">
  1629.        <Output TaskParameter="ConsoleOutput" PropertyName="git_version_string" />
  1630.      </Exec>
  1631. -
  1632. -    <WriteLinesToFile
  1633. -      File="$(IntermediateOutputPath)/git_version.h"
  1634. -      Overwrite="True"
  1635. -      Lines="
  1636. -/* Generated file, do not edit */
  1637. -#define GIT_COMMIT_ID &quot;$(git_version_string)&quot;
  1638. -" />
  1639. +    <WriteLinesToFile File="$(IntermediateOutputPath)/git_version.h" Overwrite="True" Lines="&#xA;/* Generated file, do not edit */&#xA;#define GIT_COMMIT_ID &quot;$(git_version_string)&quot;&#xA;" />
  1640.    </Target>
  1641.    <ItemGroup Label="ProjectConfigurations">
  1642.      <ProjectConfiguration Include="Debug|Win32">
  1643. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  1644. index 6c1d743..ed5470a 100644
  1645. --- a/build.vc19/nfsd/nfsd.vcxproj
  1646. +++ b/build.vc19/nfsd/nfsd.vcxproj
  1647. @@ -1,20 +1,10 @@
  1648. <?xml version="1.0" encoding="utf-8"?>
  1649.  <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  1650.    <Target Name="generate_git_version_header" BeforeTargets="ClCompile">
  1651. -    <Exec
  1652. -      Command="git describe --long --always --dirty --exclude=* --abbrev=8"
  1653. -      ConsoleToMSBuild="True"
  1654. -      IgnoreExitCode="False">
  1655. +    <Exec Command="git describe --long --always --dirty --exclude=* --abbrev=8" ConsoleToMSBuild="True" IgnoreExitCode="False">
  1656.        <Output TaskParameter="ConsoleOutput" PropertyName="git_version_string" />
  1657.      </Exec>
  1658. -
  1659. -    <WriteLinesToFile
  1660. -      File="$(IntermediateOutputPath)/git_version.h"
  1661. -      Overwrite="True"
  1662. -      Lines="
  1663. -/* Generated file, do not edit */
  1664. -#define GIT_COMMIT_ID &quot;$(git_version_string)&quot;
  1665. -" />
  1666. +    <WriteLinesToFile File="$(IntermediateOutputPath)/git_version.h" Overwrite="True" Lines="&#xA;/* Generated file, do not edit */&#xA;#define GIT_COMMIT_ID &quot;$(git_version_string)&quot;&#xA;" />
  1667.    </Target>
  1668.    <ItemGroup Label="ProjectConfigurations">
  1669.      <ProjectConfiguration Include="Debug|Win32">
  1670. --
  1671. 2.45.1
  1672.  
  1673. From 80132695dafcbd0db0137bb185cf08692cda3ab7 Mon Sep 17 00:00:00 2001
  1674. From: Roland Mainz <roland.mainz@nrubsig.org>
  1675. Date: Thu, 9 Jan 2025 14:00:40 +0100
  1676. Subject: [PATCH 07/44] tests: Fix nfs_ea widechar printf format strings
  1677.  
  1678. Fix nfs_ea widechar printf format strings, e.g. use %ls for
  1679. wide strings.
  1680.  
  1681. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1682. ---
  1683. tests/ea/Makefile |  4 ++--
  1684.  tests/ea/main.c   | 28 ++++++++++++++++++----------
  1685.  2 files changed, 20 insertions(+), 12 deletions(-)
  1686.  
  1687. diff --git a/tests/ea/Makefile b/tests/ea/Makefile
  1688. index 9f2bc98..480449b 100644
  1689. --- a/tests/ea/Makefile
  1690. +++ b/tests/ea/Makefile
  1691. @@ -7,10 +7,10 @@
  1692.  all: nfs_ea.i686.exe nfs_ea.x86_64.exe nfs_ea.exe
  1693.  
  1694.  nfs_ea.i686.exe: main.c
  1695. -       clang -target i686-pc-windows-gnu -municode -Wall -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -g main.c -lntdll -o nfs_ea.i686.exe
  1696. +       clang -target i686-pc-windows-gnu -std=gnu17 -municode -Wall -Wextra -D_CRT_STDIO_ISO_WIDE_SPECIFIERS=1 -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -g main.c -lntdll -o nfs_ea.i686.exe
  1697.  
  1698.  nfs_ea.x86_64.exe: main.c
  1699. -       clang -target x86_64-pc-windows-gnu -municode -Wall -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -g main.c -lntdll -o nfs_ea.x86_64.exe
  1700. +       clang -target x86_64-pc-windows-gnu -std=gnu17 -municode -Wall -Wextra -D_CRT_STDIO_ISO_WIDE_SPECIFIERS=1 -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -g main.c -lntdll -o nfs_ea.x86_64.exe
  1701.  
  1702.  nfs_ea.exe: nfs_ea.x86_64.exe
  1703.         rm -f nfs_ea.exe
  1704. diff --git a/tests/ea/main.c b/tests/ea/main.c
  1705. index 6a9931c..983b529 100644
  1706. --- a/tests/ea/main.c
  1707. +++ b/tests/ea/main.c
  1708. @@ -20,6 +20,14 @@
  1709.   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  1710.   */
  1711.  
  1712. +#if ((__STDC_VERSION__-0) < 201710L)
  1713. +#error Code requires ISO C17
  1714. +#endif
  1715. +
  1716. +#ifndef _CRT_STDIO_ISO_WIDE_SPECIFIERS
  1717. +#error Code requires ISO wide-char behaviour
  1718. +#endif /* !_CRT_STDIO_ISO_WIDE_SPECIFIERS */
  1719. +
  1720.  #include <ntifs.h>
  1721.  #include <strsafe.h>
  1722.  #include <stdio.h>
  1723. @@ -108,7 +116,7 @@ static NTSTATUS ea_get(
  1724.          status = RtlUnicodeToUTF8N(EaQuery->EaName, MAX_EA_VALUE,
  1725.              &ActualByteCount, EaName, EaNameLength);
  1726.          if (status) {
  1727. -            fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with 0x%lx\n", EaName, (long)status);
  1728. +            fwprintf(stderr, L"RtlUnicodeToUTF8N('%ls') failed with 0x%lx\n", EaName, (long)status);
  1729.              goto out;
  1730.          }
  1731.          EaQuery->EaNameLength = (UCHAR)ActualByteCount - 1;
  1732. @@ -169,7 +177,7 @@ static NTSTATUS full_ea_init(
  1733.          FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName),
  1734.          &ActualByteCount, EaName, EaNameLength);
  1735.      if (status) {
  1736. -        fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with 0x%lx\n", EaName, (long)status);
  1737. +        fwprintf(stderr, L"RtlUnicodeToUTF8N('%ls') failed with 0x%lx\n", EaName, (long)status);
  1738.          goto out;
  1739.      }
  1740.      EaBuffer->EaNameLength = (UCHAR)ActualByteCount - 1;
  1741. @@ -184,7 +192,7 @@ static NTSTATUS full_ea_init(
  1742.              MAX_FULLEA - FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName) - EaBuffer->EaNameLength - 1,
  1743.              &ActualByteCount, EaValue, EaValueLength);
  1744.          if (status) {
  1745. -            fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with 0x%lx\n", EaName, (long)status);
  1746. +            fwprintf(stderr, L"RtlUnicodeToUTF8N('%ls') failed with 0x%lx\n", EaName, (long)status);
  1747.              goto out;
  1748.          }
  1749.          EaBuffer->EaValueLength = (UCHAR)ActualByteCount - 1;
  1750. @@ -253,7 +261,7 @@ int wmain(int argc, const wchar_t *argv[])
  1751.          status = full_ea_init(argv[3], argv[4], EaBuffer, &EaLength);
  1752.          if (status)
  1753.              goto out;
  1754. -        wprintf(L"Creating file %s.\n", argv[1]);
  1755. +        wprintf(L"Creating file '%ls'.\n", argv[1]);
  1756.      } else if (wcscmp(argv[2], L"set") == 0) {
  1757.          if (argc < 4) {
  1758.              fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> set <name> [value]\n");
  1759. @@ -280,7 +288,7 @@ int wmain(int argc, const wchar_t *argv[])
  1760.          &IoStatusBlock, NULL, FileAttributes, ShareAccess,
  1761.          CreateDisposition, CreateOptions, EaBuffer, EaLength);
  1762.      if (status) {
  1763. -        fwprintf(stderr, L"NtCreateFile(%s) failed with 0x%lx\n", FileName.Buffer, (long)status);
  1764. +        fwprintf(stderr, L"NtCreateFile('%ls') failed with 0x%lx\n", FileName.Buffer, (long)status);
  1765.          goto out;
  1766.      }
  1767.  
  1768. @@ -291,18 +299,18 @@ int wmain(int argc, const wchar_t *argv[])
  1769.          if (status)
  1770.              goto out_close;
  1771.  
  1772. -        wprintf(L"Setting extended attribute '%s' on file '%s':\n",
  1773. +        wprintf(L"Setting extended attribute '%ls' on file '%ls':\n",
  1774.              argv[3], FileName.Buffer);
  1775.          status = ea_set(FileHandle, EaBuffer, EaLength);
  1776.      } else if (wcscmp(argv[2], L"get") == 0) {
  1777. -        wprintf(L"Querying extended attribute on file '%s':\n",
  1778. -            argv[3], FileName.Buffer);
  1779. +        wprintf(L"Querying extended attribute on file '%ls':\n",
  1780. +            FileName.Buffer);
  1781.          status = ea_get(FileHandle, argv + 3, argc - 3);
  1782.      } else if (wcscmp(argv[2], L"list") == 0) {
  1783. -        wprintf(L"Listing extended attributes for '%s':\n", FileName.Buffer);
  1784. +        wprintf(L"Listing extended attributes for '%ls':\n", FileName.Buffer);
  1785.          status = ea_list(FileHandle);
  1786.      } else if (wcscmp(argv[2], L"create") == 0) {
  1787. -        wprintf(L"File '%s' was created with \n", FileName.Buffer);
  1788. +        wprintf(L"File '%ls' was created with \n", FileName.Buffer);
  1789.          status = ea_get(FileHandle, argv + 3, 1);
  1790.      }
  1791.  
  1792. --
  1793. 2.45.1
  1794.  
  1795. From 0b0240c186cf5086b40aa8e772a0c875929f436e Mon Sep 17 00:00:00 2001
  1796. From: Roland Mainz <roland.mainz@nrubsig.org>
  1797. Date: Thu, 9 Jan 2025 14:08:03 +0100
  1798. Subject: [PATCH 08/44] tests: Add nfs_ea usage
  1799.  
  1800. Add usage message to nfs_ea
  1801.  
  1802. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1803. ---
  1804. tests/ea/main.c | 2 ++
  1805.  1 file changed, 2 insertions(+)
  1806.  
  1807. diff --git a/tests/ea/main.c b/tests/ea/main.c
  1808. index 983b529..cd954f8 100644
  1809. --- a/tests/ea/main.c
  1810. +++ b/tests/ea/main.c
  1811. @@ -247,6 +247,8 @@ int wmain(int argc, const wchar_t *argv[])
  1812.  
  1813.      if (argc < 3) {
  1814.          fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> <create|set|get|list> ...\n");
  1815. +        fwprintf(stderr, L"Example:\n");
  1816. +        fwprintf(stderr, L"\tnfs_ea '\\??\\L:\\builds\\bash_build1' get NfsV3Attributes\n");
  1817.          status = STATUS_INVALID_PARAMETER;
  1818.          goto out;
  1819.      }
  1820. --
  1821. 2.45.1
  1822.  
  1823. From d62b751b6b5791582d2fb37ee6906de339944385 Mon Sep 17 00:00:00 2001
  1824. From: Roland Mainz <roland.mainz@nrubsig.org>
  1825. Date: Thu, 9 Jan 2025 15:05:35 +0100
  1826. Subject: [PATCH 09/44] tests: Add "getnfs3attr" subcmd to nfs_ea
  1827.  
  1828. Add "getnfs3attr" subcmd to nfs_ea, which formats
  1829. the contents of a "NfsV3Attributes" EA.
  1830.  
  1831. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1832. ---
  1833. tests/ea/main.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++--
  1834.  1 file changed, 91 insertions(+), 2 deletions(-)
  1835.  
  1836. diff --git a/tests/ea/main.c b/tests/ea/main.c
  1837. index cd954f8..507bc12 100644
  1838. --- a/tests/ea/main.c
  1839. +++ b/tests/ea/main.c
  1840. @@ -158,6 +158,85 @@ out:
  1841.      return status;
  1842.  }
  1843.  
  1844. +typedef struct _nfs3_attrs {
  1845. +    DWORD type, mode, nlink, uid, gid, filler1;
  1846. +    LARGE_INTEGER size, used;
  1847. +    struct {
  1848. +        DWORD specdata1;
  1849. +        DWORD specdata2;
  1850. +    } rdev;
  1851. +    LONGLONG fsid, fileid;
  1852. +    LONGLONG atime, mtime, ctime;
  1853. +} nfs3_attrs;
  1854. +
  1855. +static NTSTATUS ea_get_nfs3attr(
  1856. +    HANDLE FileHandle)
  1857. +{
  1858. +    IO_STATUS_BLOCK IoStatusBlock;
  1859. +    CHAR GetBuffer[MAX_LIST_LEN] = { 0 };
  1860. +    CHAR FullBuffer[MAX_LIST_LEN] = { 0 };
  1861. +    PFILE_GET_EA_INFORMATION EaList = (PFILE_GET_EA_INFORMATION)GetBuffer, EaQuery;
  1862. +    PFILE_FULL_EA_INFORMATION EaBuffer = (PFILE_FULL_EA_INFORMATION)FullBuffer;
  1863. +    ULONG EaListLength;
  1864. +    NTSTATUS status;
  1865. +
  1866. +    (void)memset(&IoStatusBlock, 0, sizeof(IoStatusBlock));
  1867. +
  1868. +    EaQuery = EaList;
  1869. +    EaListLength = 0;
  1870. +
  1871. +    (void)strcpy(EaQuery->EaName, "NfsV3Attributes");
  1872. +    EaQuery->EaNameLength = 15;
  1873. +    EaQuery->NextEntryOffset = FIELD_OFFSET(FILE_GET_EA_INFORMATION, EaName) + EaQuery->EaNameLength + 1;
  1874. +
  1875. +    EaListLength += EaQuery->NextEntryOffset;
  1876. +    EaQuery->NextEntryOffset = 0;
  1877. +    EaQuery = (PFILE_GET_EA_INFORMATION)((PCHAR)EaQuery + EaQuery->NextEntryOffset);
  1878. +
  1879. +    status = ZwQueryEaFile(FileHandle, &IoStatusBlock,
  1880. +        EaBuffer, MAX_FULLEA, FALSE, EaList, EaListLength, NULL, TRUE);
  1881. +    switch (status) {
  1882. +    case STATUS_SUCCESS:
  1883. +        break;
  1884. +    case STATUS_NO_EAS_ON_FILE:
  1885. +        (void)fprintf(stderr, "No EAs on file, status=0x%lx.\n", (long)status);
  1886. +        goto out;
  1887. +    default:
  1888. +        (void)fprintf(stderr, "ZwQueryEaFile('%s') failed with 0x%lx\n", EaList->EaName, (long)status);
  1889. +        goto out;
  1890. +    }
  1891. +
  1892. +    (void)printf("%s:\n", EaBuffer->EaName);
  1893. +    nfs3_attrs *n3a = (void *)(EaBuffer->EaName + EaBuffer->EaNameLength + 1);
  1894. +    (void)printf("(\n"
  1895. +        "\ttype=%d\n"
  1896. +        "\tmode=0%o\n"
  1897. +        "\tnlink=%d\n"
  1898. +        "\tuid=%d\n\tgid=%d\n"
  1899. +        "\tsize=%lld\n\tused=%lld\n"
  1900. +        "\trdev=( specdata1=0x%x specdata2=0x%x )\n"
  1901. +        "\tfsid=%lld\n\tfileid=%lld\n"
  1902. +        "\tatime=%lld\n\tmtime=%lld\n\tctime=%lld\n"
  1903. +        ")\n",
  1904. +        (int)n3a->type,
  1905. +        (int)n3a->mode,
  1906. +        (int)n3a->nlink,
  1907. +        (int)n3a->uid,
  1908. +        (int)n3a->gid,
  1909. +        (long long)n3a->size.QuadPart,
  1910. +        (long long)n3a->used.QuadPart,
  1911. +        (int)n3a->rdev.specdata1,
  1912. +        (int)n3a->rdev.specdata2,
  1913. +        (long long)n3a->fsid,
  1914. +        (long long)n3a->fileid,
  1915. +        (long long)n3a->atime,
  1916. +        (long long)n3a->mtime,
  1917. +        (long long)n3a->ctime);
  1918. +
  1919. +out:
  1920. +    return status;
  1921. +}
  1922. +
  1923.  static NTSTATUS full_ea_init(
  1924.      IN LPCWSTR EaName,
  1925.      IN LPCWSTR EaValue,
  1926. @@ -246,9 +325,9 @@ int wmain(int argc, const wchar_t *argv[])
  1927.      ULONG EaLength = 0;
  1928.  
  1929.      if (argc < 3) {
  1930. -        fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> <create|set|get|list> ...\n");
  1931. +        fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> <create|set|get|getnfs3attr|list> ...\n");
  1932.          fwprintf(stderr, L"Example:\n");
  1933. -        fwprintf(stderr, L"\tnfs_ea '\\??\\L:\\builds\\bash_build1' get NfsV3Attributes\n");
  1934. +        fwprintf(stderr, L"\tnfs_ea '\\??\\L:\\builds\\bash_build1' getnfs3attr\n");
  1935.          status = STATUS_INVALID_PARAMETER;
  1936.          goto out;
  1937.      }
  1938. @@ -277,6 +356,12 @@ int wmain(int argc, const wchar_t *argv[])
  1939.              status = STATUS_INVALID_PARAMETER;
  1940.              goto out;
  1941.          }
  1942. +    } else if (wcscmp(argv[2], L"getnfs3attr") == 0) {
  1943. +        if (argc < 3) {
  1944. +            fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> getnfs3attr\n");
  1945. +            status = STATUS_INVALID_PARAMETER;
  1946. +            goto out;
  1947. +        }
  1948.      } else if (wcscmp(argv[2], L"list") != 0) {
  1949.          fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> <create|set|get|list> ...\n");
  1950.          status = STATUS_INVALID_PARAMETER;
  1951. @@ -308,6 +393,10 @@ int wmain(int argc, const wchar_t *argv[])
  1952.          wprintf(L"Querying extended attribute on file '%ls':\n",
  1953.              FileName.Buffer);
  1954.          status = ea_get(FileHandle, argv + 3, argc - 3);
  1955. +    } else if (wcscmp(argv[2], L"getnfs3attr") == 0) {
  1956. +        wprintf(L"Querying extended attribute 'NfsV3Attributes' on file '%ls':\n",
  1957. +            FileName.Buffer);
  1958. +        status = ea_get_nfs3attr(FileHandle);
  1959.      } else if (wcscmp(argv[2], L"list") == 0) {
  1960.          wprintf(L"Listing extended attributes for '%ls':\n", FileName.Buffer);
  1961.          status = ea_list(FileHandle);
  1962. --
  1963. 2.45.1
  1964.  
  1965. From 931a784fee9f017e6092d4a6f8c620f289f24071 Mon Sep 17 00:00:00 2001
  1966. From: Roland Mainz <roland.mainz@nrubsig.org>
  1967. Date: Thu, 9 Jan 2025 17:22:51 +0100
  1968. Subject: [PATCH 10/44] tests: winfsinfo1: Add getnfs3attr subcmd
  1969.  
  1970. winfsinfo1: Add getnfs3attr subcmd.
  1971.  
  1972. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1973. ---
  1974. tests/winfsinfo1/Makefile    |   4 +-
  1975.  tests/winfsinfo1/winfsinfo.c | 149 ++++++++++++++++++++++++++++++++++-
  1976.  2 files changed, 150 insertions(+), 3 deletions(-)
  1977.  
  1978. diff --git a/tests/winfsinfo1/Makefile b/tests/winfsinfo1/Makefile
  1979. index 47ee557..b0b8d93 100644
  1980. --- a/tests/winfsinfo1/Makefile
  1981. +++ b/tests/winfsinfo1/Makefile
  1982. @@ -7,10 +7,10 @@
  1983.  all: winfsinfo.i686.exe winfsinfo.x86_64.exe winfsinfo.exe
  1984.  
  1985.  winfsinfo.i686.exe: winfsinfo.c
  1986. -       clang -target i686-pc-windows-gnu -Wall -DUNICODE=1 -D_UNICODE=1 -g winfsinfo.c -o winfsinfo.i686.exe
  1987. +       clang -target i686-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g winfsinfo.c -lntdll -o winfsinfo.i686.exe
  1988.  
  1989.  winfsinfo.x86_64.exe: winfsinfo.c
  1990. -       clang -target x86_64-pc-windows-gnu -Wall -DUNICODE=1 -D_UNICODE=1 -g winfsinfo.c -o winfsinfo.x86_64.exe
  1991. +       clang -target x86_64-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g winfsinfo.c -lntdll -o winfsinfo.x86_64.exe
  1992.  
  1993.  winfsinfo.exe: winfsinfo.x86_64.exe
  1994.         ln -s winfsinfo.x86_64.exe winfsinfo.exe
  1995. diff --git a/tests/winfsinfo1/winfsinfo.c b/tests/winfsinfo1/winfsinfo.c
  1996. index 682d089..7b80ea4 100644
  1997. --- a/tests/winfsinfo1/winfsinfo.c
  1998. +++ b/tests/winfsinfo1/winfsinfo.c
  1999. @@ -622,6 +622,149 @@ done:
  2000.      return res;
  2001.  }
  2002.  
  2003. +typedef struct _nfs3_attrs {
  2004. +    DWORD type, mode, nlink, uid, gid, filler1;
  2005. +    LARGE_INTEGER size, used;
  2006. +    struct {
  2007. +        DWORD specdata1;
  2008. +        DWORD specdata2;
  2009. +    } rdev;
  2010. +    LONGLONG fsid, fileid;
  2011. +    LONGLONG atime, mtime, ctime;
  2012. +} nfs3_attrs;
  2013. +
  2014. +#define NfsV3Attributes_NAME "NfsV3Attributes"
  2015. +
  2016. +typedef struct _FILE_EA_INFORMATION {
  2017. +    ULONG EaSize;
  2018. +} FILE_EA_INFORMATION, *PFILE_EA_INFORMATION;
  2019. +
  2020. +typedef struct _FILE_GET_EA_INFORMATION {
  2021. +    ULONG NextEntryOffset;
  2022. +    UCHAR EaNameLength;
  2023. +    CHAR  EaName[1];
  2024. +} FILE_GET_EA_INFORMATION, *PFILE_GET_EA_INFORMATION;
  2025. +
  2026. +typedef struct _FILE_FULL_EA_INFORMATION {
  2027. +    ULONG NextEntryOffset;
  2028. +    UCHAR Flags;
  2029. +    UCHAR EaNameLength;
  2030. +    USHORT EaValueLength;
  2031. +    CHAR EaName[1];
  2032. +} FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION;
  2033. +
  2034. +typedef struct _IO_STATUS_BLOCK {
  2035. +    union {
  2036. +        NTSTATUS Status;
  2037. +        PVOID Pointer;
  2038. +    } DUMMYUNIONNAME;
  2039. +    ULONG_PTR Information;
  2040. +} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
  2041. +
  2042. +#define STATUS_SUCCESS ((NTSTATUS)0x00000000)
  2043. +#define STATUS_NO_EAS_ON_FILE ((NTSTATUS)0xC0000052)
  2044. +
  2045. +NTSYSAPI
  2046. +NTSTATUS
  2047. +NTAPI
  2048. +ZwQueryEaFile(
  2049. +  IN HANDLE FileHandle,
  2050. +  OUT PIO_STATUS_BLOCK IoStatusBlock,
  2051. +  OUT PVOID Buffer,
  2052. +  IN ULONG Length,
  2053. +  IN BOOLEAN ReturnSingleEntry,
  2054. +  IN PVOID EaList OPTIONAL,
  2055. +  IN ULONG EaListLength,
  2056. +  IN PULONG EaIndex OPTIONAL,
  2057. +  IN BOOLEAN RestartScan);
  2058. +
  2059. +static
  2060. +bool get_getnfs3attr(const char *progname, const char *filename)
  2061. +{
  2062. +    int res = EXIT_FAILURE;
  2063. +
  2064. +    HANDLE fileHandle = CreateFileA(filename,
  2065. +        GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
  2066. +        FILE_FLAG_BACKUP_SEMANTICS, NULL);
  2067. +    if (fileHandle == INVALID_HANDLE_VALUE) {
  2068. +        (void)fprintf(stderr,
  2069. +            "%s: Error opening file '%s'. Last error was %d.\n",
  2070. +            progname,
  2071. +            filename,
  2072. +            (int)GetLastError());
  2073. +        return EXIT_FAILURE;
  2074. +    }
  2075. +
  2076. +    struct {
  2077. +        FILE_FULL_EA_INFORMATION ffeai;
  2078. +        char buf[sizeof(NfsV3Attributes_NAME) + sizeof(nfs3_attrs)];
  2079. +    } ffeai_buf;
  2080. +    struct {
  2081. +        FILE_GET_EA_INFORMATION fgeai;
  2082. +        char buf[sizeof(NfsV3Attributes_NAME)];
  2083. +    } fgeai_buf;
  2084. +
  2085. +    NTSTATUS status;
  2086. +    IO_STATUS_BLOCK io;
  2087. +
  2088. +    fgeai_buf.fgeai.NextEntryOffset = 0;
  2089. +    fgeai_buf.fgeai.EaNameLength = 15;
  2090. +    (void)strcpy(fgeai_buf.fgeai.EaName, NfsV3Attributes_NAME);
  2091. +
  2092. +    status = ZwQueryEaFile(fileHandle, &io,
  2093. +        &ffeai_buf.ffeai, sizeof(ffeai_buf), TRUE,
  2094. +        &fgeai_buf.fgeai, sizeof(fgeai_buf), NULL, TRUE);
  2095. +
  2096. +    switch (status) {
  2097. +        case STATUS_SUCCESS:
  2098. +            break;
  2099. +        case STATUS_NO_EAS_ON_FILE:
  2100. +            (void)fprintf(stderr, "No EAs on file, status=0x%lx.\n", (long)status);
  2101. +            res = EXIT_FAILURE;
  2102. +            goto done;
  2103. +        default:
  2104. +            (void)fprintf(stderr, "ZwQueryEaFile() failed with 0x%lx\n", (long)status);
  2105. +            res = EXIT_FAILURE;
  2106. +            goto done;
  2107. +    }
  2108. +
  2109. +    nfs3_attrs *n3a = (nfs3_attrs *)(ffeai_buf.ffeai.EaName
  2110. +        + ffeai_buf.ffeai.EaNameLength + 1);
  2111. +
  2112. +    (void)printf("(\n");
  2113. +
  2114. +    (void)printf("\tfilename='%s'\n"
  2115. +        "\ttype=%d\n"
  2116. +        "\tmode=0%o\n"
  2117. +        "\tnlink=%d\n"
  2118. +        "\tuid=%d\n\tgid=%d\n"
  2119. +        "\tsize=%lld\n\tused=%lld\n"
  2120. +        "\trdev=( specdata1=0x%x specdata2=0x%x )\n"
  2121. +        "\tfsid=%lld\n\tfileid=%lld\n"
  2122. +        "\tatime=%lld\n\tmtime=%lld\n\tctime=%lld\n"
  2123. +        ")\n",
  2124. +        filename,
  2125. +        (int)n3a->type,
  2126. +        (int)n3a->mode,
  2127. +        (int)n3a->nlink,
  2128. +        (int)n3a->uid,
  2129. +        (int)n3a->gid,
  2130. +        (long long)n3a->size.QuadPart,
  2131. +        (long long)n3a->used.QuadPart,
  2132. +        (int)n3a->rdev.specdata1,
  2133. +        (int)n3a->rdev.specdata2,
  2134. +        (long long)n3a->fsid,
  2135. +        (long long)n3a->fileid,
  2136. +        (long long)n3a->atime,
  2137. +        (long long)n3a->mtime,
  2138. +        (long long)n3a->ctime);
  2139. +    res = EXIT_SUCCESS;
  2140. +
  2141. +done:
  2142. +    (void)CloseHandle(fileHandle);
  2143. +    return res;
  2144. +}
  2145. +
  2146.  static
  2147.  void usage(void)
  2148.  {
  2149. @@ -633,7 +776,8 @@ void usage(void)
  2150.          "filenameinfo|"
  2151.          "filenormalizednameinfo|"
  2152.          "filecasesensitiveinfo|"
  2153. -        "getfiletime"
  2154. +        "getfiletime|"
  2155. +        "getnfs3attr"
  2156.          "> path\n");
  2157.  }
  2158.  
  2159. @@ -672,6 +816,9 @@ int main(int ac, char *av[])
  2160.      else if (!strcmp(subcmd, "filecasesensitiveinfo")) {
  2161.          return get_filecasesensitiveinfo(av[0], av[2]);
  2162.      }
  2163. +    else if (!strcmp(subcmd, "getnfs3attr")) {
  2164. +        return get_getnfs3attr(av[0], av[2]);
  2165. +    }
  2166.      else {
  2167.          (void)fprintf(stderr, "%s: Unknown subcmd '%s'\n", av[0], subcmd);
  2168.          return EXIT_FAILURE;
  2169. --
  2170. 2.45.1
  2171.  
  2172. From b1d6efedf80badcf08d485b773ad3577cde48485 Mon Sep 17 00:00:00 2001
  2173. From: Roland Mainz <roland.mainz@nrubsig.org>
  2174. Date: Sat, 11 Jan 2025 14:18:33 +0100
  2175. Subject: [PATCH 11/44] Backport "update signal and key_call declarations to
  2176.  allow compile with gcc-15"
  2177.  
  2178. Backport "update signal and key_call declarations to allow compile with gcc-15"
  2179.     ---- snip ----
  2180.     From 240ee6c774729c9c24812aa8912f1fcf8996b162 Mon Sep 17 00:00:00 2001
  2181.     From: Rudi Heitbaum <rudi@heitbaum.com>
  2182.     Date: Thu, 2 Jan 2025 08:46:24 -0500
  2183.     Subject: [PATCH] update signal and key_call declarations to allow compile with
  2184.      gcc-15
  2185.  
  2186.     Follow up patch addressing the following declarations:
  2187.       sed -n 75,77p libtirpc-1.3.6/src/key_call.c
  2188.       cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
  2189.       cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
  2190.       des_block *(*__key_gendes_LOCAL)() = 0;
  2191.  
  2192.     Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
  2193.     Signed-off-by: Steve Dickson <steved@redhat.com>
  2194.     ---- snip ----
  2195.  
  2196. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2197. ---
  2198. libtirpc/src/auth_time.c | 4 ++--
  2199.  libtirpc/src/key_call.c  | 6 +++---
  2200.  2 files changed, 5 insertions(+), 5 deletions(-)
  2201.  
  2202. diff --git a/libtirpc/src/auth_time.c b/libtirpc/src/auth_time.c
  2203. index 854442b..1e72ed4 100644
  2204. --- a/libtirpc/src/auth_time.c
  2205. +++ b/libtirpc/src/auth_time.c
  2206. @@ -250,7 +250,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
  2207.         endpoint                teps[32];
  2208.         nis_server              tsrv = { 0 };
  2209.  #ifndef _WIN32
  2210. -       void                    (*oldsig)() = NULL; /* old alarm handler */
  2211. +       void                    (*oldsig)(int) = NULL; /* old alarm handler */
  2212.  #endif
  2213.         struct sockaddr_in      sin;
  2214.         int                     s = RPC_ANYSOCK;
  2215. @@ -420,7 +420,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
  2216.                 } else {
  2217.                         int res;
  2218.  #ifndef _WIN32
  2219. -                       oldsig = (void (*)())signal(SIGALRM, alarm_hndler);
  2220. +                       oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler);
  2221.                         saw_alarm = 0; /* global tracking the alarm */
  2222.                         alarm(20); /* only wait 20 seconds */
  2223.  #else
  2224. diff --git a/libtirpc/src/key_call.c b/libtirpc/src/key_call.c
  2225. index f65fc6a..5722cb9 100644
  2226. --- a/libtirpc/src/key_call.c
  2227. +++ b/libtirpc/src/key_call.c
  2228. @@ -86,9 +86,9 @@
  2229.   * implementations of these functions, and to call those in key_call().
  2230.   */
  2231.  
  2232. -cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
  2233. -cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
  2234. -des_block *(*__key_gendes_LOCAL)() = 0;
  2235. +cryptkeyres *(*__key_encryptsession_pk_LOCAL)(uid_t, char *) = 0;
  2236. +cryptkeyres *(*__key_decryptsession_pk_LOCAL)(uid_t, char *) = 0;
  2237. +des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0;
  2238.  
  2239.  static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *);
  2240.  
  2241. --
  2242. 2.45.1
  2243.  
  2244. From b3747552bcf7de67a3b611844e7e006819b002e8 Mon Sep 17 00:00:00 2001
  2245. From: Roland Mainz <roland.mainz@nrubsig.org>
  2246. Date: Sat, 11 Jan 2025 14:38:43 +0100
  2247. Subject: [PATCH 12/44] tests: nfsbuildtest bash build requires the "texinfo"
  2248.  package
  2249.  
  2250. nfsbuildtest bash build requires the "texinfo" package
  2251.  
  2252. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2253. ---
  2254. tests/nfsbuildtest/nfsbuildtest.ksh93 | 1 +
  2255.  1 file changed, 1 insertion(+)
  2256.  
  2257. diff --git a/tests/nfsbuildtest/nfsbuildtest.ksh93 b/tests/nfsbuildtest/nfsbuildtest.ksh93
  2258. index ecda2cd..bd996ab 100644
  2259. --- a/tests/nfsbuildtest/nfsbuildtest.ksh93
  2260. +++ b/tests/nfsbuildtest/nfsbuildtest.ksh93
  2261. @@ -621,6 +621,7 @@ function main
  2262.                         is_toolkit_pkg_installed itp 'libncurses-devel' || (( errc++ ))
  2263.                         is_toolkit_pkg_installed itp 'gettext' || (( errc++ ))
  2264.                         is_toolkit_pkg_installed itp 'gettext-devel' || (( errc++ ))
  2265. +                       is_toolkit_pkg_installed itp 'texinfo' || (( errc++ ))
  2266.                         (( errc > 0 )) && return 1
  2267.                         bash_build
  2268.                         return $?
  2269. --
  2270. 2.45.1
  2271.  
  2272. From 4f09701d7365ff065230c834933ca41a20a9e2fa Mon Sep 17 00:00:00 2001
  2273. From: Roland Mainz <roland.mainz@nrubsig.org>
  2274. Date: Tue, 14 Jan 2025 13:52:12 +0100
  2275. Subject: [PATCH 13/44] cygwin: Add secureboot switch to msnfs41client.bash
  2276.  install subcmd
  2277.  
  2278. Add secureboot switch to msnfs41client.bash install subcmd
  2279.  
  2280. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2281. ---
  2282. cygwin/devel/msnfs41client.bash | 16 ++++++++++------
  2283.  1 file changed, 10 insertions(+), 6 deletions(-)
  2284.  
  2285. diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash
  2286. index cff5cc2..4699afb 100755
  2287. --- a/cygwin/devel/msnfs41client.bash
  2288. +++ b/cygwin/devel/msnfs41client.bash
  2289. @@ -99,6 +99,8 @@ function nfsclient_install
  2290.         set -o xtrace
  2291.         set -o errexit
  2292.  
  2293. +       typeset use_secureboot=false
  2294. +
  2295.         # switch to the location where this script is installed,
  2296.         # because on Cygwin the script will be installed
  2297.         # in /cygdrive/c/cygwin/lib/msnfs41client/ (32bit) or
  2298. @@ -140,13 +142,15 @@ function nfsclient_install
  2299.         regtool add '/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows NT/CurrentVersion/Image File Execution Options/nfs_mount.exe'
  2300.         regtool -i set '/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows NT/CurrentVersion/Image File Execution Options/nfs_mount.exe/FrontEndHeapDebugOptions' 0x08
  2301.  
  2302. -       # make sure we can load the kernel driver
  2303. -       # (does not work with SecureBoot)
  2304. -       bcdedit /set testsigning on
  2305. +       if ! $use_secureboot ; then
  2306. +               # make sure we can load the kernel driver
  2307. +               # (does not work with SecureBoot)
  2308. +               bcdedit /set testsigning on
  2309.  
  2310. -       # enable local kernel debugging
  2311. -       bcdedit /debug on
  2312. -       bcdedit /dbgsettings local
  2313. +               # enable local kernel debugging
  2314. +               bcdedit /debug on
  2315. +               bcdedit /dbgsettings local
  2316. +       fi
  2317.  
  2318.         # set domain name
  2319.         typeset win_domainname=''
  2320. --
  2321. 2.45.1
  2322.  
  2323. From 2c35e9b0af9581fdd2bc021a2f63662b19910c0e Mon Sep 17 00:00:00 2001
  2324. From: Roland Mainz <roland.mainz@nrubsig.org>
  2325. Date: Tue, 14 Jan 2025 13:53:13 +0100
  2326. Subject: [PATCH 14/44] cygwin: Add workaround for coreutils 9.5-1 /bin/cp hang
  2327.  with compressed files
  2328.  
  2329. Add workaround for coreutils 9.5-1 /bin/cp hang with compressed files.
  2330.  
  2331. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2332. ---
  2333. cygwin/Makefile.install | 2 ++
  2334.  1 file changed, 2 insertions(+)
  2335.  
  2336. diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
  2337. index 1ec9884..8a4b878 100644
  2338. --- a/cygwin/Makefile.install
  2339. +++ b/cygwin/Makefile.install
  2340. @@ -58,6 +58,8 @@ installdest:
  2341.                 cp $(VS_BUILD_DIR32)/../Release/nfs41_np.lib $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/i686/nfs41_np.lib ; \
  2342.                 cp $(VS_BUILD_DIR32)/../Release/nfs41_np.pdb $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/i686/nfs41_np.pdb ; \
  2343.         fi
  2344. +       # workaround for coreutils 9.5-1 /bin/cp bug stuck in an endless loop with compressed files
  2345. +       chattr -V -c $(VS_BUILD_DIR)/nfs41_driver.*
  2346.         cp $(VS_BUILD_DIR)/nfs41_driver.*       $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
  2347.         cp $(PROJECT_BASEDIR_DIR)/nfs41rdr.inf  $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
  2348.         cp $(PROJECT_BASEDIR_DIR)/etc_netconfig $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
  2349. --
  2350. 2.45.1
  2351.  
  2352. From e7bb534eb0e0c9f6aaaddc474d6e337a6e6a9d8b Mon Sep 17 00:00:00 2001
  2353. From: Roland Mainz <roland.mainz@nrubsig.org>
  2354. Date: Tue, 14 Jan 2025 14:34:21 +0100
  2355. Subject: [PATCH 15/44] tests: Fix nfsbuildtest bash build for gcc15
  2356.  
  2357. Fix nfsbuildtest bash build for gcc15, by forcing gcc -std=gnu17
  2358. (ISO C17 mode+GNU extensions).
  2359.  
  2360. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2361. ---
  2362. tests/nfsbuildtest/nfsbuildtest.ksh93 | 2 +-
  2363.  1 file changed, 1 insertion(+), 1 deletion(-)
  2364.  
  2365. diff --git a/tests/nfsbuildtest/nfsbuildtest.ksh93 b/tests/nfsbuildtest/nfsbuildtest.ksh93
  2366. index bd996ab..85bfcc7 100644
  2367. --- a/tests/nfsbuildtest/nfsbuildtest.ksh93
  2368. +++ b/tests/nfsbuildtest/nfsbuildtest.ksh93
  2369. @@ -295,7 +295,7 @@ function bash_build
  2370.         fi
  2371.  
  2372.         # workaround for gcc 15.0 used in Cygwin 3.6
  2373. -       export CFLAGS="-Wno-error=implicit-function-declaration -Wno-error=implicit-int"
  2374. +       export CFLAGS="-std=gnu17 -Wno-error=implicit-function-declaration -Wno-error=implicit-int"
  2375.  
  2376.         if $config_use_posix_ksh93_builtins ; then
  2377.                 CONFIG_SHELL=/usr/bin/ksh93 ksh93 ./configure "${configure_options[@]}"
  2378. --
  2379. 2.45.1
  2380.  
  2381. From 9348daf80483a2c618e8bfb1e6222d2362ddbea0 Mon Sep 17 00:00:00 2001
  2382. From: Roland Mainz <roland.mainz@nrubsig.org>
  2383. Date: Tue, 14 Jan 2025 15:45:13 +0100
  2384. Subject: [PATCH 16/44] daemon: Cleanup Cygwin+MSYS2 silly rename code+support
  2385.  newer Cygwin
  2386.  
  2387. Cleanup Cygwin+MSYS2 silly rename code, and add support
  2388. for newer Cygwin (>= commit "Cygwin: try_to_bin: transpose deleted
  2389. file name to valid Unicode chars").
  2390.  
  2391. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2392. ---
  2393. daemon/setattr.c | 108 ++++++++++++++++++++++++++++++++---------------
  2394.  1 file changed, 75 insertions(+), 33 deletions(-)
  2395.  
  2396. diff --git a/daemon/setattr.c b/daemon/setattr.c
  2397. index 79709da..1d02042 100644
  2398. --- a/daemon/setattr.c
  2399. +++ b/daemon/setattr.c
  2400. @@ -237,6 +237,59 @@ static int is_dst_name_opened(nfs41_abs_path *dst_path, nfs41_session *dst_sessi
  2401.  
  2402.      return status;
  2403.  }
  2404. +
  2405. +#define CYGWIN_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE 1
  2406. +#define MSYS2_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE 1
  2407. +
  2408. +#if defined(CYGWIN_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE) || \
  2409. +    defined(MSYS2_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE)
  2410. +#define STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE_SUPPORT 1
  2411. +#endif
  2412. +
  2413. +#ifdef STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE_SUPPORT
  2414. +typedef struct _silly_rename_seq
  2415. +{
  2416. +    const char *name;
  2417. +    size_t size;
  2418. +    const wchar_t *in_sequence;
  2419. +    const wchar_t *out_sequence;
  2420. +} silly_rename_seq;
  2421. +
  2422. +const silly_rename_seq silly_rename_seqlist[] = {
  2423. +#ifdef CYGWIN_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE
  2424. +    /* old Cygwin sequence, using valid Unicode characters */
  2425. +    {
  2426. +        .name="Cygwin1",
  2427. +        .size=4,
  2428. +        .in_sequence=L".\xdc63\xdc79\xdc67",
  2429. +        .out_sequence=L".cyg"
  2430. +    },
  2431. +    /*
  2432. +     * New Cygwin sequence, using valid Unicode characters -
  2433. +     * see Cygwin commit "Cygwin: try_to_bin: transpose
  2434. +     * deleted file name to valid Unicode chars"
  2435. +     */
  2436. +    {
  2437. +        .name="Cygwin2",
  2438. +        .size=4,
  2439. +        .in_sequence=L".\xf763\xf779\xf767",
  2440. +        .out_sequence=L".cyg"
  2441. +    },
  2442. +#endif /* CYGWIN_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE */
  2443. +#ifdef MSYS2_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE
  2444. +    {
  2445. +        .name="msys2",
  2446. +        .size=5,
  2447. +        .in_sequence=L".\xdc6d\xdc73\xdc79\xdc73",
  2448. +        .out_sequence=L".msys"
  2449. +    },
  2450. +#endif /* MSYS2_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE */
  2451. +    {
  2452. +        .name = NULL
  2453. +    }
  2454. +};
  2455. +#endif /* STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE_SUPPORT */
  2456. +
  2457.  static int handle_nfs41_rename(void *daemon_context, setattr_upcall_args *args)
  2458.  {
  2459.      nfs41_open_state *state = args->state;
  2460. @@ -284,14 +337,12 @@ static int handle_nfs41_rename(void *daemon_context, setattr_upcall_args *args)
  2461.  
  2462.      EASSERT((rename->FileNameLength%sizeof(WCHAR)) == 0);
  2463.  
  2464. -#define CYGWIN_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE 1
  2465. -#define MSYS2_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE 1
  2466. -
  2467. -#ifdef CYGWIN_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE
  2468. +#ifdef STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE_SUPPORT
  2469.      /*
  2470. -     * Stomp Cygwin "silly rename" invalid Unicode sequence
  2471. +     * Stomp old+new Cygwin+MSYS2 "silly rename" invalid Unicode
  2472. +     * sequence
  2473.       *
  2474. -     * Cygwin has it's own variation of "silly rename" (i.e. if
  2475. +     * Cygwin+MSYS2 has it's own variation of "silly rename" (i.e. if
  2476.       * someone deletes a file while someone else still has
  2477.       * a valid fd to that file it first renames that file with a
  2478.       * special prefix, see
  2479. @@ -299,12 +350,15 @@ static int handle_nfs41_rename(void *daemon_context, setattr_upcall_args *args)
  2480.       * |try_to_bin()|).
  2481.       *
  2482.       * Unfortunately on filesystems supporting Unicode
  2483. -     * (i.e. |FILE_UNICODE_ON_DISK|) Cygwin adds the prefix
  2484. +     * (i.e. |FILE_UNICODE_ON_DISK|) older Cygwin (before Cygwin
  2485. +     * commit "Cygwin: try_to_bin: transpose deleted file name to
  2486. +     * valid Unicode chars") adds the prefix
  2487.       * L".\xdc63\xdc79\xdc67", which is NOT a valid UTF-16 sequence,
  2488.       * and will be rejected by a filesystem validating the
  2489.       * UTF-16 sequence (e.g. SAMBA, ReFS, OpenZFS, ...; for SAMBA
  2490.       * Cygwin uses the ".cyg" prefix used for
  2491.       * non-|FILE_UNICODE_ON_DISK| filesystems).
  2492. +     *
  2493.       * In our case the NFSv4.1 protocol requires valid UTF-8
  2494.       * sequences, and the NFS server will reject filenames if either
  2495.       * the server or the exported filesystem will validate the UTF-8
  2496. @@ -315,35 +369,23 @@ static int handle_nfs41_rename(void *daemon_context, setattr_upcall_args *args)
  2497.       * used for non-|FILE_UNICODE_ON_DISK| filesystems.
  2498.       * We ignore the side-effects here, e.g. that Win32 will still
  2499.       * "remember" the original filename in the file name cache.
  2500. -     */
  2501. -    if ((rename->FileNameLength > (4*sizeof(wchar_t))) &&
  2502. -        (!memcmp(rename->FileName,
  2503. -            L".\xdc63\xdc79\xdc67", (4*sizeof(wchar_t))))) {
  2504. -        DPRINTF(1, ("handle_nfs41_rename(args->path='%s'): "
  2505. -            "Cygwin sillyrename prefix \".\\xdc63\\xdc79\\xdc67\" "
  2506. -            "detected, squishing prefix to \".cyg\"\n",
  2507. -            args->path));
  2508. -        (void)memcpy(rename->FileName, L".cyg", 4*sizeof(wchar_t));
  2509. -    }
  2510. -#endif /* CYGWIN_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE */
  2511. -#ifdef MSYS2_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE
  2512. -    /*
  2513. -     * Stomp MSYS2 "silly rename" invalid Unicode sequence
  2514.       *
  2515. -     * Same procedure as Cygwin "silly rename", just with a different
  2516. -     * prefix (L".\xdc6d\xdc73\xdc79\xdc73")
  2517. +     * For MSYS2+newer Cygwin we do the same.
  2518.       */
  2519. -    if ((rename->FileNameLength > (5*sizeof(wchar_t))) &&
  2520. -        (!memcmp(rename->FileName,
  2521. -            L".\xdc6d\xdc73\xdc79\xdc73", (5*sizeof(wchar_t))))) {
  2522. -        DPRINTF(1, ("handle_nfs41_rename(args->path='%s'): "
  2523. -            "msys2 sillyrename prefix "
  2524. -            "\".\\xdc6d\\xdc73\\xdc79\\xdc73\" detected, squishing "
  2525. -            "prefix to \".msys\"\n",
  2526. -            args->path));
  2527. -        (void)memcpy(rename->FileName, L".msys", 5*sizeof(wchar_t));
  2528. +    for (const silly_rename_seq *srs = &silly_rename_seqlist[0];
  2529. +        srs->name != NULL ; srs++) {
  2530. +        if ((rename->FileNameLength > (srs->size*sizeof(wchar_t))) &&
  2531. +            (!memcmp(rename->FileName,
  2532. +                srs->in_sequence, (srs->size*sizeof(wchar_t))))) {
  2533. +            DPRINTF(1, ("handle_nfs41_rename(args->path='%s'): "
  2534. +                "'%s' sillyrename prefix "
  2535. +                "detected, squishing prefix to '%ls'\n",
  2536. +                args->path, srs->name, srs->out_sequence));
  2537. +                (void)memcpy(rename->FileName, srs->out_sequence,
  2538. +                srs->size*sizeof(wchar_t));
  2539. +        }
  2540.      }
  2541. -#endif /* MSYS2_STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE */
  2542. +#endif /* STOMP_SILLY_RENAME_INVALID_UTF16_SEQUENCE_SUPPORT */
  2543.  
  2544.      dst_path.len = (unsigned short)WideCharToMultiByte(CP_UTF8,
  2545.          WC_ERR_INVALID_CHARS|WC_NO_BEST_FIT_CHARS,
  2546. --
  2547. 2.45.1
  2548.  
  2549. From 560a81d7c555dae57d20116ff8b96bc32fad99d0 Mon Sep 17 00:00:00 2001
  2550. From: Roland Mainz <roland.mainz@nrubsig.org>
  2551. Date: Wed, 15 Jan 2025 14:39:37 +0100
  2552. Subject: [PATCH 17/44] sys: Allocate memory for |nfs41_fcb_list_entry| via
  2553.  |ExAllocateFromNPagedLookasideList()|&co.
  2554.  
  2555. Allocate memory for |nfs41_fcb_list_entry| via
  2556. |ExAllocateFromNPagedLookasideList()|&co.
  2557.  
  2558. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2559. ---
  2560. sys/nfs41sys_buildconfig.h |  1 +
  2561.  sys/nfs41sys_driver.c      | 44 +++++++++++++++++++++++++++++++++++---
  2562.  sys/nfs41sys_driver.h      |  5 +++++
  2563.  sys/nfs41sys_openclose.c   |  3 +--
  2564.  4 files changed, 48 insertions(+), 5 deletions(-)
  2565.  
  2566. diff --git a/sys/nfs41sys_buildconfig.h b/sys/nfs41sys_buildconfig.h
  2567. index 3774af6..bc0c0d9 100644
  2568. --- a/sys/nfs41sys_buildconfig.h
  2569. +++ b/sys/nfs41sys_buildconfig.h
  2570. @@ -23,6 +23,7 @@
  2571.  
  2572.  /* Driver build config */
  2573.  #define USE_LOOKASIDELISTS_FOR_UPDOWNCALLENTRY_MEM 1
  2574. +#define USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM 1
  2575.  // #define LOOKASIDELISTS_STATS 1
  2576.  
  2577.  // #define USE_ENTIRE_PATH_FOR_NETROOT 1
  2578. diff --git a/sys/nfs41sys_driver.c b/sys/nfs41sys_driver.c
  2579. index e2f8ed7..dd7975c 100644
  2580. --- a/sys/nfs41sys_driver.c
  2581. +++ b/sys/nfs41sys_driver.c
  2582. @@ -92,6 +92,9 @@ DECLARE_CONST_ANSI_STRING(NfsActOnLink, EA_NFSACTONLINK);
  2583.  NPAGED_LOOKASIDE_LIST updowncall_entry_upcall_lookasidelist;
  2584.  NPAGED_LOOKASIDE_LIST updowncall_entry_downcall_lookasidelist;
  2585.  #endif /* USE_LOOKASIDELISTS_FOR_UPDOWNCALLENTRY_MEM */
  2586. +#ifdef USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM
  2587. +NPAGED_LOOKASIDE_LIST fcblistentry_lookasidelist;
  2588. +#endif /* USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM */
  2589.  
  2590.  #ifdef ENABLE_TIMINGS
  2591.  nfs41_timings lookup;
  2592. @@ -140,6 +143,31 @@ LARGE_INTEGER unix_time_diff;
  2593.  nfs41_init_driver_state nfs41_init_state = NFS41_INIT_DRIVER_STARTABLE;
  2594.  nfs41_start_driver_state nfs41_start_state = NFS41_START_DRIVER_STARTABLE;
  2595.  
  2596. +nfs41_fcb_list_entry *nfs41_allocate_nfs41_fcb_list_entry(void)
  2597. +{
  2598. +    nfs41_fcb_list_entry *e;
  2599. +#ifdef USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM
  2600. +    e = ExAllocateFromNPagedLookasideList(
  2601. +        &fcblistentry_lookasidelist);
  2602. +
  2603. +#else
  2604. +    e = RxAllocatePoolWithTag(NonPagedPoolNx,
  2605. +        sizeof(nfs41_fcb_list_entry),
  2606. +        NFS41_MM_POOLTAG_OPEN);
  2607. +#endif /* USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM */
  2608. +
  2609. +    return e;
  2610. +}
  2611. +
  2612. +void nfs41_free_nfs41_fcb_list_entry(nfs41_fcb_list_entry *entry)
  2613. +{
  2614. +#ifdef USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM
  2615. +    ExFreeToNPagedLookasideList(&fcblistentry_lookasidelist,
  2616. +        entry);
  2617. +#else
  2618. +    RxFreePool(entry);
  2619. +#endif /* USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM */
  2620. +}
  2621.  
  2622.  NTSTATUS marshall_unicode_as_utf8(
  2623.      IN OUT unsigned char **pos,
  2624. @@ -675,7 +703,7 @@ VOID nfs41_remove_fcb_entry(
  2625.              DbgP("nfs41_remove_fcb_entry: Found match for fcb=0x%p\n", fcb);
  2626.  #endif
  2627.              RemoveEntryList(pEntry);
  2628. -            RxFreePool(cur);
  2629. +            nfs41_free_nfs41_fcb_list_entry(cur);
  2630.              break;
  2631.          }
  2632.          if (pEntry->Flink == &openlist.head) {
  2633. @@ -908,8 +936,7 @@ void enable_caching(
  2634.  #ifdef DEBUG_TIME_BASED_COHERENCY
  2635.          DbgP("enable_caching: delegation recalled: srv_open=0x%p\n", SrvOpen);
  2636.  #endif
  2637. -        oentry = RxAllocatePoolWithTag(NonPagedPoolNx,
  2638. -            sizeof(nfs41_fcb_list_entry), NFS41_MM_POOLTAG_OPEN);
  2639. +        oentry = nfs41_allocate_nfs41_fcb_list_entry();
  2640.          if (oentry == NULL)
  2641.              goto out_release_fcblistlock;
  2642.          oentry->fcb = SrvOpen->pFcb;
  2643. @@ -1361,6 +1388,17 @@ NTSTATUS DriverEntry(
  2644.          POOL_NX_ALLOCATION, sizeof(nfs41_updowncall_entry),
  2645.          NFS41_MM_POOLTAG_DOWN, 0);
  2646.  #endif /* USE_LOOKASIDELISTS_FOR_UPDOWNCALLENTRY_MEM */
  2647. +#ifdef USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM
  2648. +    /*
  2649. +     * The |Depth| parameter is unfortunately ignored in Win10,
  2650. +     * otherwise we could use |MmQuerySystemSize()| to scale the
  2651. +     * lookasidelists
  2652. +     */
  2653. +    ExInitializeNPagedLookasideList(
  2654. +        &fcblistentry_lookasidelist, NULL, NULL,
  2655. +        POOL_NX_ALLOCATION, sizeof(nfs41_fcb_list_entry),
  2656. +        NFS41_MM_POOLTAG_OPEN, 0);
  2657. +#endif /* USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM */
  2658.      InitializeObjectAttributes(&oattrs, NULL, OBJ_KERNEL_HANDLE, NULL, NULL);
  2659.      status = PsCreateSystemThread(&dev_exts->openlistHandle, mask,
  2660.          &oattrs, NULL, NULL, &fcbopen_main, NULL);
  2661. diff --git a/sys/nfs41sys_driver.h b/sys/nfs41sys_driver.h
  2662. index 79ef82c..860e476 100644
  2663. --- a/sys/nfs41sys_driver.h
  2664. +++ b/sys/nfs41sys_driver.h
  2665. @@ -119,6 +119,9 @@ DECLARE_EXTERN_CONST_ANSI_STRING(NfsActOnLink);
  2666.  extern NPAGED_LOOKASIDE_LIST updowncall_entry_upcall_lookasidelist;
  2667.  extern NPAGED_LOOKASIDE_LIST updowncall_entry_downcall_lookasidelist;
  2668.  #endif /* USE_LOOKASIDELISTS_FOR_UPDOWNCALLENTRY_MEM */
  2669. +#ifdef USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM
  2670. +extern NPAGED_LOOKASIDE_LIST fcblistentry_lookasidelist;
  2671. +#endif /* USE_LOOKASIDELISTS_FOR_FCBLISTENTRY_MEM */
  2672.  
  2673.  #ifdef ENABLE_TIMINGS
  2674.  extern nfs41_timings lookup;
  2675. @@ -608,6 +611,8 @@ NTSTATUS nfs41_QueryDirectory(
  2676.      IN OUT PRX_CONTEXT RxContext);
  2677.  
  2678.  /* nfs41sys_driver.c */
  2679. +nfs41_fcb_list_entry *nfs41_allocate_nfs41_fcb_list_entry(void);
  2680. +void nfs41_free_nfs41_fcb_list_entry(nfs41_fcb_list_entry *entry);
  2681.  NTSTATUS marshall_unicode_as_utf8(
  2682.      IN OUT unsigned char **pos,
  2683.      IN PCUNICODE_STRING str);
  2684. diff --git a/sys/nfs41sys_openclose.c b/sys/nfs41sys_openclose.c
  2685. index d2624e7..59c8398 100644
  2686. --- a/sys/nfs41sys_openclose.c
  2687. +++ b/sys/nfs41sys_openclose.c
  2688. @@ -911,8 +911,7 @@ retry_on_link:
  2689.              DbgP("nfs41_Create: received no delegations: srv_open=0x%p "
  2690.                  "ctime=%llu\n", SrvOpen, entry->ChangeTime);
  2691.  #endif
  2692. -            oentry = RxAllocatePoolWithTag(NonPagedPoolNx,
  2693. -                sizeof(nfs41_fcb_list_entry), NFS41_MM_POOLTAG_OPEN);
  2694. +            oentry = nfs41_allocate_nfs41_fcb_list_entry();
  2695.              if (oentry == NULL) {
  2696.                  status = STATUS_INSUFFICIENT_RESOURCES;
  2697.                  goto out_free;
  2698. --
  2699. 2.45.1
  2700.  
  2701. From 73fa76e699a7dac16f33c67f208350e93738baab Mon Sep 17 00:00:00 2001
  2702. From: Roland Mainz <roland.mainz@nrubsig.org>
  2703. Date: Wed, 15 Jan 2025 14:44:10 +0100
  2704. Subject: [PATCH 18/44] daemon: Remove unnecessary |ZeroMemory()| from
  2705.  |decode_readdir_entry()|
  2706.  
  2707. Remove unnecessary |ZeroMemory()| from |decode_readdir_entry()|.
  2708.  
  2709. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2710. ---
  2711. daemon/nfs41_xdr.c | 7 +++++--
  2712.  1 file changed, 5 insertions(+), 2 deletions(-)
  2713.  
  2714. diff --git a/daemon/nfs41_xdr.c b/daemon/nfs41_xdr.c
  2715. index 0004138..f899b7b 100644
  2716. --- a/daemon/nfs41_xdr.c
  2717. +++ b/daemon/nfs41_xdr.c
  2718. @@ -2328,14 +2328,14 @@ static bool_t decode_readdir_entry(
  2719.      readdir_entry_iterator *it)
  2720.  {
  2721.      uint64_t cookie;
  2722. -    unsigned char name[NFS4_OPAQUE_LIMIT];
  2723. +    unsigned char name[NFS4_OPAQUE_LIMIT+1];
  2724.      unsigned char *nameptr = &name[0];
  2725.      uint32_t name_len, entry_len;
  2726.      fattr4 attrs = { 0 };
  2727.  
  2728.      /* decode into temporaries so we can determine if there's enough
  2729.       * room in the buffer for this entry */
  2730. -    ZeroMemory(name, NFS4_OPAQUE_LIMIT);
  2731. +    name[0] = '\0';
  2732.      name_len = NFS4_OPAQUE_LIMIT;
  2733.      entry_len = (uint32_t)FIELD_OFFSET(nfs41_readdir_entry, name);
  2734.      attrs.attr_vals_len = NFS4_OPAQUE_LIMIT;
  2735. @@ -2356,6 +2356,9 @@ static bool_t decode_readdir_entry(
  2736.          return TRUE;
  2737.  
  2738.      name_len += 1; /* account for null terminator */
  2739. +    name[name_len] = '\0';
  2740. +    EASSERT(name_len < NFS4_OPAQUE_LIMIT);
  2741. +
  2742.      if (entry_len + name_len <= it->remaining_len)
  2743.      {
  2744.          XDR fattr_xdr;
  2745. --
  2746. 2.45.1
  2747.  
  2748. From 5a99020f85a8ee0810f4c9c19e6c3d0f59812a96 Mon Sep 17 00:00:00 2001
  2749. From: Roland Mainz <roland.mainz@nrubsig.org>
  2750. Date: Wed, 15 Jan 2025 16:08:54 +0100
  2751. Subject: [PATCH 19/44] sys: Set |SRVOPEN_FLAG_NO_BUFFERING_STATE_CHANGE| if we
  2752.  only want file attributes
  2753.  
  2754. Set |SRVOPEN_FLAG_NO_BUFFERING_STATE_CHANGE| if we only want file
  2755. attributes.
  2756.  
  2757. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2758. ---
  2759. sys/nfs41sys_openclose.c | 15 +++++++++++++++
  2760.  1 file changed, 15 insertions(+)
  2761.  
  2762. diff --git a/sys/nfs41sys_openclose.c b/sys/nfs41sys_openclose.c
  2763. index 59c8398..d6b2767 100644
  2764. --- a/sys/nfs41sys_openclose.c
  2765. +++ b/sys/nfs41sys_openclose.c
  2766. @@ -342,6 +342,15 @@ static BOOLEAN isWriteOnlyDesiredAccess(PNT_CREATE_PARAMETERS params)
  2767.      return FALSE;
  2768.  }
  2769.  
  2770. +static BOOLEAN isAttributeOnlyDesiredAccess(PNT_CREATE_PARAMETERS params)
  2771. +{
  2772. +    if ((params->DesiredAccess &
  2773. +        ~(FILE_READ_ATTRIBUTES|FILE_WRITE_ATTRIBUTES|SYNCHRONIZE)) == 0) {
  2774. +        return TRUE;
  2775. +    }
  2776. +    return FALSE;
  2777. +}
  2778. +
  2779.  static BOOLEAN areOpenParamsValid(NT_CREATE_PARAMETERS *params)
  2780.  {
  2781.      /* from ms-fsa page 52 */
  2782. @@ -856,6 +865,12 @@ retry_on_link:
  2783.  #endif
  2784.          RxChangeBufferingState((PSRV_OPEN)SrvOpen, ULongToPtr(flag), 1);
  2785.      }
  2786. +
  2787. +    if (!nfs41_fcb->StandardInfo.Directory &&
  2788. +        isAttributeOnlyDesiredAccess(params)) {
  2789. +        SrvOpen->Flags |= SRVOPEN_FLAG_NO_BUFFERING_STATE_CHANGE;
  2790. +    }
  2791. +
  2792.      if (!nfs41_fcb->StandardInfo.Directory &&
  2793.              isDataAccess(params->DesiredAccess)) {
  2794.          nfs41_fobx->deleg_type = entry->u.Open.deleg_type;
  2795. --
  2796. 2.45.1
  2797.  
  2798. From 106ecd4283f9a1274dc24bbc14d0bf7885ee6ce9 Mon Sep 17 00:00:00 2001
  2799. From: Roland Mainz <roland.mainz@nrubsig.org>
  2800. Date: Thu, 16 Jan 2025 15:41:49 +0100
  2801. Subject: [PATCH 20/44] daemon: |bitmap4_cpy()| should only write |dst| fields
  2802.  which are used by the |src|
  2803.  
  2804. |bitmap4_cpy()| should only write |dst| fields which are used by the
  2805. |src|.
  2806. That should fix drmemory hits.
  2807.  
  2808. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2809. ---
  2810. daemon/util.h | 6 +++++-
  2811.  1 file changed, 5 insertions(+), 1 deletion(-)
  2812.  
  2813. diff --git a/daemon/util.h b/daemon/util.h
  2814. index 7a4e12a..d17dc45 100644
  2815. --- a/daemon/util.h
  2816. +++ b/daemon/util.h
  2817. @@ -131,7 +131,11 @@ static __inline void bitmap4_cpy(
  2818.      OUT bitmap4 *restrict dst,
  2819.      IN  const bitmap4 *restrict src)
  2820.  {
  2821. -    (void)memcpy(dst, src, sizeof(bitmap4));
  2822. +    uint32_t i;
  2823. +    for (i = 0; i < src->count; i++) {
  2824. +        dst->arr[i] = src->arr[i];
  2825. +    }
  2826. +    dst->count = src->count;
  2827.  }
  2828.  
  2829.  static __inline void bitmap4_clear(
  2830. --
  2831. 2.45.1
  2832.  
  2833. From f13f053b83400d0b09e4fbb922a6cccdddd5112d Mon Sep 17 00:00:00 2001
  2834. From: Roland Mainz <roland.mainz@nrubsig.org>
  2835. Date: Thu, 16 Jan 2025 15:47:16 +0100
  2836. Subject: [PATCH 21/44] daemon: Fix drmemory hits in |nfs41_file_info_cpy()|
  2837.  
  2838. Fix drmemory hits in |nfs41_file_info_cpy()|, which were caused
  2839. by using |memcpy()| over only partially initialised
  2840. |nfs41_file_info| structures.
  2841.  
  2842. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  2843. ---
  2844. daemon/delegation.c   |   2 +-
  2845.  daemon/fileinfoutil.c | 146 ++++++++++++++++++++++++++++++++++++++----
  2846.  daemon/lookup.c       |   4 +-
  2847.  daemon/util.h         |   6 +-
  2848.  4 files changed, 143 insertions(+), 15 deletions(-)
  2849.  
  2850. diff --git a/daemon/delegation.c b/daemon/delegation.c
  2851. index 97d63f5..22f1009 100644
  2852. --- a/daemon/delegation.c
  2853. +++ b/daemon/delegation.c
  2854. @@ -515,7 +515,7 @@ int nfs41_delegate_open(
  2855.  
  2856.      if (create == OPEN4_CREATE) {
  2857.          EASSERT(createattrs != NULL);
  2858. -        nfs41_file_info_cpy(info, createattrs);
  2859. +        nfs41_file_info_cpy(info, createattrs, 0);
  2860.  
  2861.          /* write delegations allow us to simulate OPEN4_CREATE with SETATTR */
  2862.          status = delegation_truncate(deleg, client, &stateid, info);
  2863. diff --git a/daemon/fileinfoutil.c b/daemon/fileinfoutil.c
  2864. index a5269fe..8278a90 100644
  2865. --- a/daemon/fileinfoutil.c
  2866. +++ b/daemon/fileinfoutil.c
  2867. @@ -445,16 +445,140 @@ void nfs_to_stat_lx_info(
  2868.  /* copy |nfs41_file_info| */
  2869.  void nfs41_file_info_cpy(
  2870.      OUT nfs41_file_info *dest,
  2871. -    IN const nfs41_file_info *src)
  2872. +    IN const nfs41_file_info *src,
  2873. +    IN int flags)
  2874.  {
  2875. -    /*
  2876. -     * FIXME: Using |memcpy()| here over the whole struct
  2877. -     * |nfs41_file_info| will trigger DrMemory uninitialized
  2878. -     * variable hits if |*src| was not completely initialized
  2879. -     */
  2880. -    (void)memcpy(dest, src, sizeof(nfs41_file_info));
  2881. -    if (src->owner != NULL)
  2882. -        dest->owner = dest->owner_buf;
  2883. -    if (src->owner_group != NULL)
  2884. -        dest->owner_group = dest->owner_group_buf;
  2885. +    const bitmap4 *attrmask = &src->attrmask;
  2886. +    bitmap4_cpy(&dest->attrmask, &src->attrmask);
  2887. +
  2888. +    if (attrmask->count > 0) {
  2889. +        if (attrmask->arr[0] & FATTR4_WORD0_SUPPORTED_ATTRS) {
  2890. +            dest->supported_attrs = src->supported_attrs;
  2891. +        }
  2892. +        if (attrmask->arr[0] & FATTR4_WORD0_TYPE) {
  2893. +            dest->type = src->type;
  2894. +        }
  2895. +        if (attrmask->arr[0] & FATTR4_WORD0_CHANGE) {
  2896. +            dest->change = src->change;
  2897. +        }
  2898. +        if (attrmask->arr[0] & FATTR4_WORD0_SIZE) {
  2899. +            dest->size = src->size;
  2900. +        }
  2901. +        if (attrmask->arr[0] & FATTR4_WORD0_LINK_SUPPORT) {
  2902. +            dest->link_support = src->link_support;
  2903. +        }
  2904. +        if (attrmask->arr[0] & FATTR4_WORD0_SYMLINK_SUPPORT) {
  2905. +            dest->symlink_support = src->symlink_support;
  2906. +        }
  2907. +        if (attrmask->arr[0] & FATTR4_WORD0_FSID) {
  2908. +            dest->fsid = src->fsid;
  2909. +        }
  2910. +        if (attrmask->arr[0] & FATTR4_WORD0_LEASE_TIME) {
  2911. +            dest->lease_time = src->lease_time;
  2912. +        }
  2913. +        if (attrmask->arr[0] & FATTR4_WORD0_RDATTR_ERROR) {
  2914. +            dest->rdattr_error = src->rdattr_error;
  2915. +        }
  2916. +        if (attrmask->arr[0] & FATTR4_WORD0_ACL) {
  2917. +            /* fixme: we should copy the contents! */
  2918. +            dest->acl = src->acl;
  2919. +        }
  2920. +        if (attrmask->arr[0] & FATTR4_WORD0_ACLSUPPORT) {
  2921. +            dest->aclsupport = src->aclsupport;
  2922. +        }
  2923. +        if (attrmask->arr[0] & FATTR4_WORD0_ARCHIVE) {
  2924. +            dest->archive = src->archive;
  2925. +        }
  2926. +        if (attrmask->arr[0] & FATTR4_WORD0_CANSETTIME) {
  2927. +            dest->cansettime = src->cansettime;
  2928. +        }
  2929. +        if (attrmask->arr[0] & FATTR4_WORD0_CASE_INSENSITIVE) {
  2930. +            dest->case_insensitive = src->case_insensitive;
  2931. +        }
  2932. +        if (attrmask->arr[0] & FATTR4_WORD0_CASE_PRESERVING) {
  2933. +            dest->case_preserving = src->case_preserving;
  2934. +        }
  2935. +        if (attrmask->arr[0] & FATTR4_WORD0_FILEID) {
  2936. +            dest->fileid = src->fileid;
  2937. +        }
  2938. +        if (attrmask->arr[0] & FATTR4_WORD0_FS_LOCATIONS) {
  2939. +            /* fixme: we should copy the contents, not the pointer! */
  2940. +            dest->fs_locations = src->fs_locations;
  2941. +        }
  2942. +        if (attrmask->arr[0] & FATTR4_WORD0_HIDDEN) {
  2943. +            dest->hidden = src->hidden;
  2944. +        }
  2945. +        if (attrmask->arr[0] & FATTR4_WORD0_MAXREAD) {
  2946. +            dest->maxread = src->maxread;
  2947. +        }
  2948. +        if (attrmask->arr[0] & FATTR4_WORD0_MAXWRITE) {
  2949. +            dest->maxwrite = src->maxwrite;
  2950. +        }
  2951. +    }
  2952. +    if (attrmask->count > 1) {
  2953. +        if (attrmask->arr[1] & FATTR4_WORD1_MODE) {
  2954. +            dest->mode = src->mode;
  2955. +        }
  2956. +        if (attrmask->arr[1] & FATTR4_WORD1_NUMLINKS) {
  2957. +            dest->numlinks = src->numlinks;
  2958. +        }
  2959. +        if (attrmask->arr[1] & FATTR4_WORD1_OWNER) {
  2960. +            EASSERT(src->owner != NULL);
  2961. +            EASSERT(src->owner[0] != '\0');
  2962. +            dest->owner = dest->owner_buf;
  2963. +            (void)strcpy(dest->owner, src->owner);
  2964. +        }
  2965. +        if (attrmask->arr[1] & FATTR4_WORD1_OWNER_GROUP) {
  2966. +            EASSERT(src->owner_group != NULL);
  2967. +            EASSERT(src->owner_group[0] != '\0');
  2968. +            dest->owner_group = dest->owner_group_buf;
  2969. +            (void)strcpy(dest->owner_group_buf, src->owner_group_buf);
  2970. +        }
  2971. +        if (attrmask->arr[1] & FATTR4_WORD1_SPACE_AVAIL) {
  2972. +            dest->space_avail = src->space_avail;
  2973. +        }
  2974. +        if (attrmask->arr[1] & FATTR4_WORD1_SPACE_FREE) {
  2975. +            dest->space_free = src->space_free;
  2976. +        }
  2977. +        if (attrmask->arr[1] & FATTR4_WORD1_SPACE_TOTAL) {
  2978. +            dest->space_total = src->space_total;
  2979. +        }
  2980. +        if (attrmask->arr[1] & FATTR4_WORD1_SYSTEM) {
  2981. +            dest->system = src->system;
  2982. +        }
  2983. +        if (attrmask->arr[1] & FATTR4_WORD1_TIME_ACCESS) {
  2984. +            dest->time_access = src->time_access;
  2985. +        }
  2986. +        if (attrmask->arr[1] & FATTR4_WORD1_TIME_CREATE) {
  2987. +            dest->time_create = src->time_create;
  2988. +        }
  2989. +        if (attrmask->arr[1] & FATTR4_WORD1_TIME_DELTA) {
  2990. +            dest->time_delta = src->time_delta;
  2991. +        }
  2992. +        if (attrmask->arr[1] & FATTR4_WORD1_TIME_MODIFY) {
  2993. +            dest->time_modify = src->time_modify;
  2994. +        }
  2995. +        if (attrmask->arr[1] & FATTR4_WORD1_DACL) {
  2996. +            /* fixme: we should copy the contents! */
  2997. +            dest->acl = src->acl;
  2998. +        }
  2999. +        if (attrmask->arr[1] & FATTR4_WORD1_FS_LAYOUT_TYPE) {
  3000. +            dest->fs_layout_types = src->fs_layout_types;
  3001. +        }
  3002. +    }
  3003. +    if (attrmask->count > 2) {
  3004. +        if (attrmask->arr[2] & FATTR4_WORD2_MODE_SET_MASKED) {
  3005. +            dest->mode_mask = src->mode_mask;
  3006. +        }
  3007. +        if (attrmask->arr[2] & FATTR4_WORD2_MDSTHRESHOLD) {
  3008. +            dest->mdsthreshold = src->mdsthreshold;
  3009. +        }
  3010. +        if (attrmask->arr[2] & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
  3011. +            dest->suppattr_exclcreat = src->suppattr_exclcreat;
  3012. +        }
  3013. +    }
  3014. +
  3015. +    if (flags & NFS41FILEINFOCPY_COPY_SYMLINK_DIR) {
  3016. +        dest->symlink_dir = src->symlink_dir;
  3017. +    }
  3018.  }
  3019. diff --git a/daemon/lookup.c b/daemon/lookup.c
  3020. index a27e923..f98edcc 100644
  3021. --- a/daemon/lookup.c
  3022. +++ b/daemon/lookup.c
  3023. @@ -236,7 +236,7 @@ static int server_lookup(
  3024.          if (target_out)
  3025.              *target_out = dir;
  3026.          if (info_out) {
  3027. -            nfs41_file_info_cpy(info_out, res->getrootattr.info);
  3028. +            nfs41_file_info_cpy(info_out, res->getrootattr.info, 0);
  3029.          }
  3030.      } else if (count == 1) {
  3031.          if (parent_out)
  3032. @@ -285,7 +285,7 @@ static int server_lookup(
  3033.              if (target_out)
  3034.                  *target_out = file;
  3035.              if (info_out) {
  3036. -                nfs41_file_info_cpy(info_out, res->getattr[i].info);
  3037. +                nfs41_file_info_cpy(info_out, res->getattr[i].info, 0);
  3038.              }
  3039.          } else if (i == count-2) {
  3040.              if (parent_out)
  3041. diff --git a/daemon/util.h b/daemon/util.h
  3042. index d17dc45..8460c2a 100644
  3043. --- a/daemon/util.h
  3044. +++ b/daemon/util.h
  3045. @@ -205,9 +205,13 @@ void nfs_to_stat_lx_info(
  3046.      IN const nfs41_file_info *info,
  3047.      OUT PFILE_STAT_LX_INFORMATION stat_lx_out);
  3048.  #endif /* NFS41_DRIVER_WSL_SUPPORT */
  3049. +
  3050. +/* Copy |info->symlink_dir| */
  3051. +#define NFS41FILEINFOCPY_COPY_SYMLINK_DIR (1 << 0)
  3052.  void nfs41_file_info_cpy(
  3053.      OUT nfs41_file_info *dest,
  3054. -    IN const nfs41_file_info *src);
  3055. +    IN const nfs41_file_info *src,
  3056. +    IN int flags);
  3057.  
  3058.  /* http://msdn.microsoft.com/en-us/library/ms724290%28VS.85%29.aspx:
  3059.   * A file time is a 64-bit value that represents the number of
  3060. --
  3061. 2.45.1
  3062.  
  3063. From fdc35492fceffcd005c8cd50c86e7341ba16d811 Mon Sep 17 00:00:00 2001
  3064. From: Roland Mainz <roland.mainz@nrubsig.org>
  3065. Date: Thu, 16 Jan 2025 17:49:32 +0100
  3066. Subject: [PATCH 22/44] tests: Document how to set up a Solaris 11.4 NFSv4.1
  3067.  nfsd
  3068.  
  3069. Document how to set up a Solaris 11.4 NFSv4.1 nfsd.
  3070.  
  3071. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3072. ---
  3073. tests/nfs_server_setup.txt | 27 +++++++++++++++++++++++++++
  3074.  1 file changed, 27 insertions(+)
  3075.  
  3076. diff --git a/tests/nfs_server_setup.txt b/tests/nfs_server_setup.txt
  3077. index 9f3a2a3..3577dd7 100644
  3078. --- a/tests/nfs_server_setup.txt
  3079. +++ b/tests/nfs_server_setup.txt
  3080. @@ -40,4 +40,31 @@ Start-Service -Name ms-nfs41-client-service
  3081.  
  3082.  C:\cygwin64\sbin\nfs_mount -o rw N nfs://192.168.209.129//
  3083.  
  3084. +
  3085. +#
  3086. +# Solaris 11.4 NFSv4.1 server setup
  3087. +#
  3088. +
  3089. +# 1. Server setup
  3090. +svcadm enable network/nfs/server
  3091. +sharectl set -p nfsmapid_domain=global.loc nfs
  3092. +sharectl set -p server_delegation=on nfs
  3093. +mkdir /nfsdata
  3094. +chmod a+rwx /nfsdata
  3095. +share -F nfs -o rw /nfsdata/
  3096. +svcs svc:/network/nfs/server:default
  3097. +
  3098. +# 2. Windows ms-nfs41-client setup:
  3099. +# Add entries for groups "sys" and "nobody"
  3100. +echo "sys:S-1-0-3:3:" >>/etc/groups
  3101. +echo "nobody:S-1-0-65534:65534:" >>/etc/group
  3102. +
  3103. +# 3. Misc commands:
  3104. +ls -v filename # list ACLs
  3105. +chmod A... # to edit ACLs
  3106. +
  3107. +# 4. Troubleshooting:
  3108. +See https://docs.oracle.com/en/operating-systems/solaris/oracle-solaris/11.4/manage-nfs/troubleshooting-network-file-systems1.html
  3109. +
  3110. +
  3111.  # EOF.
  3112. --
  3113. 2.45.1
  3114.  
  3115. From f10c221750d6345f68537ab933c69db0881f84ff Mon Sep 17 00:00:00 2001
  3116. From: Roland Mainz <roland.mainz@nrubsig.org>
  3117. Date: Fri, 17 Jan 2025 15:29:01 +0100
  3118. Subject: [PATCH 23/44] tests: Fix nfsbuildtest.ksh93 msnfs41client build
  3119.  
  3120. Fix nfsbuildtest.ksh93 msnfs41client build, which stopped working
  3121. after adding the --version support (commit
  3122. "build.vc19,daemon,mount: Add -V/--version options to
  3123. nfs_mount+nfsd, including commit id").
  3124.  
  3125. Reported-by: Cedric Blancher <cedric.blancher@gmail.com>
  3126. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3127. ---
  3128. tests/nfsbuildtest/nfsbuildtest.ksh93 | 14 ++++++++++++--
  3129.  1 file changed, 12 insertions(+), 2 deletions(-)
  3130.  
  3131. diff --git a/tests/nfsbuildtest/nfsbuildtest.ksh93 b/tests/nfsbuildtest/nfsbuildtest.ksh93
  3132. index 85bfcc7..e86a1f1 100644
  3133. --- a/tests/nfsbuildtest/nfsbuildtest.ksh93
  3134. +++ b/tests/nfsbuildtest/nfsbuildtest.ksh93
  3135. @@ -430,6 +430,9 @@ function msnfs41client_build
  3136.  
  3137.         cd "$PWD/ms-nfs41-client/"
  3138.  
  3139. +       # make sure git commands (like "git describe ...") work
  3140. +       git config --global --add safe.directory "$PWD"
  3141. +
  3142.         #
  3143.         # patch sources and configure build
  3144.         #
  3145. @@ -446,8 +449,15 @@ function msnfs41client_build
  3146.         #
  3147.         # build ms-nfs41-client
  3148.         #
  3149. -       export PATH+=":/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Current/Bin/"
  3150. -       time make -j1 -f cygwin/Makefile bintarball
  3151. +       (
  3152. +               # Visual Studio 19 64bit+32bit kernel codepath
  3153. +               # fixme: Add support for VS2022 64bit-only codepath
  3154. +               export PATH+=":/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Current/Bin/"
  3155. +               set -o errexit
  3156. +               time make -j1 -f cygwin/Makefile build
  3157. +               time make -j1 -f cygwin/Makefile installdest
  3158. +               time make -j1 -f cygwin/Makefile bintarball
  3159. +       )
  3160.         echo $?
  3161.  
  3162.         echo "#Done."
  3163. --
  3164. 2.45.1
  3165.  
  3166. From 3e9870c8c98fba0ec164c93a8a1a8ef64ad0c439 Mon Sep 17 00:00:00 2001
  3167. From: Roland Mainz <roland.mainz@nrubsig.org>
  3168. Date: Fri, 17 Jan 2025 15:32:00 +0100
  3169. Subject: [PATCH 24/44] daemon: Increase |NFS4_EASIZE| to deal with larger EAs
  3170.  
  3171. Increase |NFS4_EASIZE| to deal with larger EAs, like
  3172. Solaris "SUNWattr_ro", "SUNWattr_rw" etc.
  3173.  
  3174. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3175. ---
  3176. daemon/nfs41_const.h | 2 +-
  3177.  1 file changed, 1 insertion(+), 1 deletion(-)
  3178.  
  3179. diff --git a/daemon/nfs41_const.h b/daemon/nfs41_const.h
  3180. index a4e408c..44209d2 100644
  3181. --- a/daemon/nfs41_const.h
  3182. +++ b/daemon/nfs41_const.h
  3183. @@ -32,7 +32,7 @@
  3184.  #define NFS4_OPAQUE_LIMIT       1024
  3185.  #define NFS4_SESSIONID_SIZE     16
  3186.  #define NFS4_STATEID_OTHER      12
  3187. -#define NFS4_EASIZE             256
  3188. +#define NFS4_EASIZE             2048
  3189.  #define NFS4_EANAME_SIZE        128
  3190.  
  3191.  /*
  3192. --
  3193. 2.45.1
  3194.  
  3195. From f75dd94b8621cb8d45591383e085873efc51bd87 Mon Sep 17 00:00:00 2001
  3196. From: Roland Mainz <roland.mainz@nrubsig.org>
  3197. Date: Sat, 18 Jan 2025 15:35:49 +0100
  3198. Subject: [PATCH 25/44] daemon: Fix DrMemory hit in |nfs41_setattr()|
  3199.  
  3200. Fix DrMemory hit in |nfs41_setattr()|:
  3201. ---- snip ----
  3202. Error #3: UNINITIALIZED READ: reading 4 byte(s)
  3203. 0 nfs41_setattr            [daemon\nfs41_ops.c:1514]
  3204. 1 handle_setacl            [daemon\acl.c:1468]
  3205. 2 upcall_handle            [daemon\upcall.c:220]
  3206. 3 nfsd_worker_thread_main  [daemon\nfs41_daemon.c:207]
  3207. 4 nfsd_thread_main         [daemon\nfs41_daemon.c:245]
  3208. ---- snip ----
  3209.  
  3210. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3211. ---
  3212. daemon/nfs41_ops.c | 3 ++-
  3213.  1 file changed, 2 insertions(+), 1 deletion(-)
  3214.  
  3215. diff --git a/daemon/nfs41_ops.c b/daemon/nfs41_ops.c
  3216. index c49cca0..a4e059d 100644
  3217. --- a/daemon/nfs41_ops.c
  3218. +++ b/daemon/nfs41_ops.c
  3219. @@ -1510,7 +1510,8 @@ int nfs41_setattr(
  3220.      nfs41_attr_cache_update(session_name_cache(session),
  3221.          file->fh.fileid, info);
  3222.  
  3223. -    if (setattr_res.attrsset.arr[0] & FATTR4_WORD0_SIZE)
  3224. +    if ((setattr_res.attrsset.count > 0) &&
  3225. +        (setattr_res.attrsset.arr[0] & FATTR4_WORD0_SIZE))
  3226.          nfs41_superblock_space_changed(file->fh.superblock);
  3227.  out:
  3228.      return status;
  3229. --
  3230. 2.45.1
  3231.  
  3232. From 36b51c29b81a310114fd165871a3388c64cc7f79 Mon Sep 17 00:00:00 2001
  3233. From: Roland Mainz <roland.mainz@nrubsig.org>
  3234. Date: Sat, 18 Jan 2025 15:38:08 +0100
  3235. Subject: [PATCH 26/44] daemon: |idmap_lookup_user()|+|idmap_lookup_group()|
  3236.  should not insert invalid data into cache
  3237.  
  3238. idmapper |idmap_lookup_user()|+|idmap_lookup_group()| should not
  3239. insert invalid data into cache on lookup failure.
  3240.  
  3241. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3242. ---
  3243. daemon/idmap.c | 8 ++++----
  3244.  1 file changed, 4 insertions(+), 4 deletions(-)
  3245.  
  3246. diff --git a/daemon/idmap.c b/daemon/idmap.c
  3247. index 4f68dd0..37b2889 100644
  3248. --- a/daemon/idmap.c
  3249. +++ b/daemon/idmap.c
  3250. @@ -813,15 +813,15 @@ static int idmap_lookup_user(
  3251.              (unsigned int)user->gid));
  3252.      }
  3253.  #endif /* !NFS41_DRIVER_FEATURE_IDMAPPER_CYGWIN */
  3254. -    if (context->config.cache_ttl) {
  3255. +    if ((status == 0) && context->config.cache_ttl) {
  3256.          /* insert the entry into the cache */
  3257.          cache_insert(&context->users, lookup, &user->entry);
  3258.      }
  3259.  #ifndef NFS41_DRIVER_FEATURE_IDMAPPER_CYGWIN
  3260.  out_free_values:
  3261. -#endif
  3262.      for (i = 0; i < NUM_ATTRIBUTES; i++)
  3263.          ldap_value_freeA(values[i]);
  3264. +#endif
  3265.  out:
  3266.      return status;
  3267.  }
  3268. @@ -918,15 +918,15 @@ static int idmap_lookup_group(
  3269.              (unsigned int)group->gid));
  3270.      }
  3271.  #endif /* !NFS41_DRIVER_FEATURE_IDMAPPER_CYGWIN */
  3272. -    if (context->config.cache_ttl) {
  3273. +    if ((status == 0) && context->config.cache_ttl) {
  3274.          /* insert the entry into the cache */
  3275.          cache_insert(&context->groups, lookup, &group->entry);
  3276.      }
  3277.  #ifndef NFS41_DRIVER_FEATURE_IDMAPPER_CYGWIN
  3278.  out_free_values:
  3279. -#endif
  3280.      for (i = 0; i < NUM_ATTRIBUTES; i++)
  3281.          ldap_value_freeA(values[i]);
  3282. +#endif
  3283.  out:
  3284.      return status;
  3285.  }
  3286. --
  3287. 2.45.1
  3288.  
  3289. From 2420813a9a59520723a4d67256f5c2e4980fca4f Mon Sep 17 00:00:00 2001
  3290. From: Roland Mainz <roland.mainz@nrubsig.org>
  3291. Date: Sat, 18 Jan 2025 16:00:28 +0100
  3292. Subject: [PATCH 27/44] daemon: |idmap_lookup_user()|+|idmap_lookup_group()|
  3293.  should not insert invalid data into cache [fix compiler warnings]
  3294.  
  3295. Fix "Unused variables" compiler warnings triggered by commit
  3296. "|idmap_lookup_user()|+|idmap_lookup_group()| should not insert
  3297. invalid data into cache".
  3298.  
  3299. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3300. ---
  3301. daemon/idmap.c | 10 ++++++----
  3302.  1 file changed, 6 insertions(+), 4 deletions(-)
  3303.  
  3304. diff --git a/daemon/idmap.c b/daemon/idmap.c
  3305. index 37b2889..7f090f8 100644
  3306. --- a/daemon/idmap.c
  3307. +++ b/daemon/idmap.c
  3308. @@ -660,16 +660,17 @@ static int idmap_lookup_user(
  3309.      const struct idmap_lookup *lookup,
  3310.      struct idmap_user *user)
  3311.  {
  3312. -    PCHAR* values[NUM_ATTRIBUTES] = { NULL };
  3313.  #ifndef NFS41_DRIVER_FEATURE_IDMAPPER_CYGWIN
  3314. +    PCHAR* values[NUM_ATTRIBUTES] = { NULL };
  3315.      const unsigned attributes = ATTR_FLAG(ATTR_USER_NAME)
  3316.          | ATTR_FLAG(ATTR_PRINCIPAL)
  3317.          | ATTR_FLAG(ATTR_UID)
  3318.          | ATTR_FLAG(ATTR_GID);
  3319.      /* principal is optional; we'll cache it if we have it */
  3320.      const unsigned optional = ATTR_FLAG(ATTR_PRINCIPAL);
  3321. +    int i;
  3322.  #endif /* !NFS41_DRIVER_FEATURE_IDMAPPER_CYGWIN */
  3323. -    int i, status;
  3324. +    int status;
  3325.  
  3326.      /* check the user cache for an existing entry */
  3327.      status = cache_lookup(&context->users, lookup, &user->entry);
  3328. @@ -831,12 +832,13 @@ static int idmap_lookup_group(
  3329.      const struct idmap_lookup *lookup,
  3330.      struct idmap_group *group)
  3331.  {
  3332. -    PCHAR* values[NUM_ATTRIBUTES] = { NULL };
  3333.  #ifndef NFS41_DRIVER_FEATURE_IDMAPPER_CYGWIN
  3334. +    PCHAR* values[NUM_ATTRIBUTES] = { NULL };
  3335.      const unsigned attributes = ATTR_FLAG(ATTR_GROUP_NAME)
  3336.          | ATTR_FLAG(ATTR_GID);
  3337. +    int i;
  3338.  #endif
  3339. -    int i, status;
  3340. +    int status;
  3341.  
  3342.      /* check the group cache for an existing entry */
  3343.      status = cache_lookup(&context->groups, lookup, &group->entry);
  3344. --
  3345. 2.45.1
  3346.  
  3347. From 15d1de4ee1e7ef4b17e1c5f0137cbbc60716ff53 Mon Sep 17 00:00:00 2001
  3348. From: Roland Mainz <roland.mainz@nrubsig.org>
  3349. Date: Sat, 18 Jan 2025 17:04:09 +0100
  3350. Subject: [PATCH 28/44] daemon: Set list of AUP_GIDs for |AUTH_UNIX|
  3351.  
  3352. Set list of AUP_GIDs for |AUTH_UNIX|, based on the list of groups
  3353. in the impersonation token's |TOKEN_GROUPS| data.
  3354.  
  3355. This fixes use of Cygwin /bin/chgrp with Solaris 11.4 NFSv4.1 nfsd,
  3356. which correctly checks any NFSv4 SETATTR request with an
  3357. |FATTR4_WORD1_OWNER_GROUP| attribute against the RPC's AUP_GID list.
  3358.  
  3359. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3360. ---
  3361. daemon/accesstoken.c    | 146 ++++++++++++++++++++++++++++++++++++++++
  3362.  daemon/accesstoken.h    |   6 ++
  3363.  daemon/nfs41_compound.c |  19 +++++-
  3364.  daemon/nfs41_const.h    |   3 +
  3365.  daemon/nfs41_rpc.c      |  19 +++++-
  3366.  5 files changed, 188 insertions(+), 5 deletions(-)
  3367.  
  3368. diff --git a/daemon/accesstoken.c b/daemon/accesstoken.c
  3369. index c212c91..e9a8d14 100644
  3370. --- a/daemon/accesstoken.c
  3371. +++ b/daemon/accesstoken.c
  3372. @@ -23,6 +23,7 @@
  3373.  #include "accesstoken.h"
  3374.  #include "sid.h"
  3375.  #include "daemon_debug.h"
  3376. +#include "nfs41_daemon.h"
  3377.  #include <Lmcons.h>
  3378.  
  3379.  #ifndef _NFS41_DRIVER_BUILDFEATURES_
  3380. @@ -130,6 +131,151 @@ bool get_token_primarygroup_name(HANDLE tok, char *out_buffer)
  3381.      return true;
  3382.  }
  3383.  
  3384. +bool fill_auth_unix_aup_gids(HANDLE tok,
  3385. +    gid_t *aup_gids, int *num_aup_gids)
  3386. +{
  3387. +    char group_names_buff[RPC_AUTHUNIX_AUP_MAX_NUM_GIDS*(GNLEN+1)];
  3388. +    char *group_names[RPC_AUTHUNIX_AUP_MAX_NUM_GIDS];
  3389. +    char *s;
  3390. +    int i;
  3391. +    int num_groups;
  3392. +
  3393. +    /* fixme: This should be a function argument */
  3394. +    extern nfs41_daemon_globals nfs41_dg;
  3395. +
  3396. +    /*
  3397. +     * VS2019 |_alloca()| cannot be used in a loop, so we use multiple
  3398. +     * pointers into one buffer instead
  3399. +     */
  3400. +    for (s=group_names_buff,i=0 ; i < RPC_AUTHUNIX_AUP_MAX_NUM_GIDS ; i++) {
  3401. +        group_names[i] = s;
  3402. +        s += GNLEN+1;
  3403. +    }
  3404. +
  3405. +    if (!get_token_groups_names(tok,
  3406. +        RPC_AUTHUNIX_AUP_MAX_NUM_GIDS, group_names, &num_groups)) {
  3407. +        eprintf("fill_auth_unix_aup_gids: "
  3408. +            "get_token_groups_names() failed\n");
  3409. +        *num_aup_gids = 0;
  3410. +        return false;
  3411. +    }
  3412. +
  3413. +    gid_t map_gid;
  3414. +    *num_aup_gids = 0;
  3415. +
  3416. +    for (i=0 ; i < num_groups ; i++) {
  3417. +        if (nfs41_idmap_group_to_gid(
  3418. +            nfs41_dg.idmapper,
  3419. +            group_names[i],
  3420. +            &map_gid) == 0) {
  3421. +            aup_gids[(*num_aup_gids)++] = map_gid;
  3422. +        }
  3423. +        else {
  3424. +            eprintf("fill_auth_unix_aup_gids: "
  3425. +                "no group mapping for '%s'\n",
  3426. +                group_names[i]);
  3427. +        }
  3428. +    }
  3429. +
  3430. +    return true;
  3431. +}
  3432. +
  3433. +bool get_token_groups_names(HANDLE tok,
  3434. +    int num_out_buffers, char *out_buffers[],
  3435. +    int *out_buffers_count)
  3436. +{
  3437. +    DWORD tokdatalen;
  3438. +    PTOKEN_GROUPS ptgroups;
  3439. +    char namebuffer[GNLEN+1];
  3440. +    DWORD namesize;
  3441. +    char domainbuffer[UNLEN+1];
  3442. +    DWORD domainbuffer_size;
  3443. +    SID_NAME_USE name_use;
  3444. +    bool retval = false;
  3445. +
  3446. +    DPRINTF(1,
  3447. +        ("--> get_token_groups_names"
  3448. +        "(tok=0x%p,num_out_buffers=%d,out_buffers=0x%p)\n",
  3449. +        (void *)tok, num_out_buffers, out_buffers));
  3450. +
  3451. +    tokdatalen = sizeof(TOKEN_GROUPS)+GETTOKINFO_EXTRA_BUFFER;
  3452. +    ptgroups = _alloca(tokdatalen);
  3453. +    if (!GetTokenInformation(tok, TokenGroups, ptgroups,
  3454. +        tokdatalen, &tokdatalen)) {
  3455. +        DPRINTF(0, ("get_token_groups_names: "
  3456. +            "GetTokenInformation(tok=0x%p, TokenGroups) failed, "
  3457. +            "status=%d.\n",
  3458. +            (void *)tok, (int)GetLastError()));
  3459. +        retval = false;
  3460. +        goto done;
  3461. +    }
  3462. +
  3463. +    DWORD i;
  3464. +    int iob = 0; /* index in |out_buffers| */
  3465. +
  3466. +    DPRINTF(1, ("get_token_groups_names: got %d groups\n",
  3467. +            (int)ptgroups->GroupCount));
  3468. +
  3469. +    for (i = 0 ; i < ptgroups->GroupCount ; i++) {
  3470. +        if (!(ptgroups->Groups[i].Attributes & SE_GROUP_ENABLED)) {
  3471. +            continue;
  3472. +        }
  3473. +
  3474. +        namesize = sizeof(namebuffer)-1;
  3475. +        domainbuffer_size = sizeof(domainbuffer)-1;
  3476. +
  3477. +        if (!LookupAccountSidA(NULL, ptgroups->Groups[i].Sid,
  3478. +            namebuffer, &namesize, domainbuffer, &domainbuffer_size, &name_use)) {
  3479. +            DPRINTF(0, ("get_token_groups_names: "
  3480. +                "LookupAccountSidA() failed, status=%d.\n",
  3481. +                (int)GetLastError()));
  3482. +            continue;
  3483. +        }
  3484. +
  3485. +        if (iob < num_out_buffers) {
  3486. +            DPRINTF(1,
  3487. +                ("get_token_groups_names: adding group='%s', domain='%s'\n",
  3488. +                namebuffer, domainbuffer));
  3489. +            (void)strcpy(out_buffers[iob], namebuffer);
  3490. +            iob++;
  3491. +        }
  3492. +        else {
  3493. +            DPRINTF(0,
  3494. +                ("get_token_groups_names: "
  3495. +                "buffer full, skip group='%s', domain='%s'\n",
  3496. +                namebuffer, domainbuffer));
  3497. +        }
  3498. +    }
  3499. +
  3500. +    *out_buffers_count = iob;
  3501. +    retval = true;
  3502. +
  3503. +done:
  3504. +    if (retval) {
  3505. +        /* success */
  3506. +        DPRINTF(1,
  3507. +            ("<-- get_token_groups_names"
  3508. +            "(tok=0x%p,num_out_buffers=%d,out_buffers=0x%p,*out_buffers_count=%d), retval=%d\n",
  3509. +            (void *)tok,
  3510. +            num_out_buffers,
  3511. +            out_buffers,
  3512. +            *out_buffers_count,
  3513. +            (int)retval));
  3514. +    }
  3515. +    else {
  3516. +        /* failure */
  3517. +        DPRINTF(1,
  3518. +            ("<-- get_token_groups_names"
  3519. +            "(tok=0x%p,num_out_buffers=%d,out_buffers=0x%p) failed, retval=%d\n",
  3520. +            (void *)tok,
  3521. +            num_out_buffers,
  3522. +            out_buffers,
  3523. +            (int)retval));
  3524. +    }
  3525. +
  3526. +    return retval;
  3527. +}
  3528. +
  3529.  bool get_token_authenticationid(HANDLE tok, LUID *out_authenticationid)
  3530.  {
  3531.      DWORD tokdatalen;
  3532. diff --git a/daemon/accesstoken.h b/daemon/accesstoken.h
  3533. index 67f49cd..3208528 100644
  3534. --- a/daemon/accesstoken.h
  3535. +++ b/daemon/accesstoken.h
  3536. @@ -24,10 +24,16 @@
  3537.  
  3538.  #include <Windows.h>
  3539.  #include <stdbool.h>
  3540. +#include "nfs41_types.h" /* for |gid_t| */
  3541.  
  3542.  bool get_token_user_name(HANDLE tok, char *out_buffer);
  3543.  bool get_token_primarygroup_name(HANDLE tok, char *out_buffer);
  3544.  bool get_token_authenticationid(HANDLE tok, LUID *out_authenticationid);
  3545.  bool set_token_privilege(HANDLE tok, const char *seprivname, bool enable_priv);
  3546. +bool fill_auth_unix_aup_gids(HANDLE tok,
  3547. +    gid_t *, int *num_aup_gids);
  3548. +bool get_token_groups_names(HANDLE tok,
  3549. +    int num_out_buffers, char *out_buffers[],
  3550. +    int *out_buffers_count);
  3551.  
  3552.  #endif /* !__NFS41_DAEMON_ACCESSTOKEN_H__ */
  3553. diff --git a/daemon/nfs41_compound.c b/daemon/nfs41_compound.c
  3554. index cb35663..8b1f192 100644
  3555. --- a/daemon/nfs41_compound.c
  3556. +++ b/daemon/nfs41_compound.c
  3557. @@ -3,6 +3,7 @@
  3558.   *
  3559.   * Olga Kornievskaia <aglo@umich.edu>
  3560.   * Casey Bodley <cbodley@umich.edu>
  3561. + * Roland Mainz <roland.mainz@nrubsig.org>
  3562.   *
  3563.   * This library is free software; you can redistribute it and/or modify it
  3564.   * under the terms of the GNU Lesser General Public License as published by
  3565. @@ -22,6 +23,7 @@
  3566.  #include <stdio.h>
  3567.  #include <stdlib.h>
  3568.  
  3569. +#include "accesstoken.h"
  3570.  #include "nfs41_compound.h"
  3571.  #include "nfs41_xdr.h"
  3572.  #include "nfs41_ops.h"
  3573. @@ -111,14 +113,25 @@ static int create_new_rpc_auth(nfs41_session *session, uint32_t op,
  3574.              sec_flavor = secinfo[i].type;
  3575.          } else {
  3576.              char machname[MAXHOSTNAMELEN + 1];
  3577. -            gid_t gids[1];
  3578. +            gid_t aup_gids[RPC_AUTHUNIX_AUP_MAX_NUM_GIDS];
  3579. +            int num_aup_gids = 0;
  3580. +
  3581. +            if (!fill_auth_unix_aup_gids(GetCurrentThreadToken(),
  3582. +                aup_gids, &num_aup_gids)) {
  3583. +                eprintf("create_new_rpc_auth: "
  3584. +                    "fill_auth_unix_aup_gids() failed\n");
  3585. +                continue;
  3586. +            }
  3587. +
  3588.              if (gethostname(machname, sizeof(machname)) == -1) {
  3589.                  eprintf("nfs41_rpc_clnt_create: gethostname failed\n");
  3590.                  continue;
  3591.              }
  3592.              machname[sizeof(machname) - 1] = '\0';
  3593. -            auth = authsys_create(machname, session->client->rpc->uid,
  3594. -                        session->client->rpc->gid, 0, gids);
  3595. +            auth = authsys_create(machname,
  3596. +                session->client->rpc->uid,
  3597. +                session->client->rpc->gid,
  3598. +                num_aup_gids, aup_gids);
  3599.              if (auth == NULL) {
  3600.                  eprintf("handle_wrongsecinfo_noname: authsys_create failed\n");
  3601.                  continue;
  3602. diff --git a/daemon/nfs41_const.h b/daemon/nfs41_const.h
  3603. index 44209d2..c785df6 100644
  3604. --- a/daemon/nfs41_const.h
  3605. +++ b/daemon/nfs41_const.h
  3606. @@ -35,6 +35,9 @@
  3607.  #define NFS4_EASIZE             2048
  3608.  #define NFS4_EANAME_SIZE        128
  3609.  
  3610. +/* Maximum number of AUP GIDs for |AUTH_UNIX| */
  3611. +#define RPC_AUTHUNIX_AUP_MAX_NUM_GIDS 16
  3612. +
  3613.  /*
  3614.   * |NFS4_FATTR4_OWNER_LIMIT| - limits for
  3615.   * |fattr4_owner|+|fattr4_owner_group|
  3616. diff --git a/daemon/nfs41_rpc.c b/daemon/nfs41_rpc.c
  3617. index f92f313..45cb3bb 100644
  3618. --- a/daemon/nfs41_rpc.c
  3619. +++ b/daemon/nfs41_rpc.c
  3620. @@ -3,6 +3,7 @@
  3621.   *
  3622.   * Olga Kornievskaia <aglo@umich.edu>
  3623.   * Casey Bodley <cbodley@umich.edu>
  3624. + * Roland Mainz <roland.mainz@nrubsig.org>
  3625.   *
  3626.   * This library is free software; you can redistribute it and/or modify it
  3627.   * under the terms of the GNU Lesser General Public License as published by
  3628. @@ -19,6 +20,7 @@
  3629.   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  3630.   */
  3631.  
  3632. +#include "accesstoken.h"
  3633.  #include "nfs41_ops.h"
  3634.  #include "daemon_debug.h"
  3635.  #include "nfs41_xdr.h"
  3636. @@ -157,7 +159,6 @@ int nfs41_rpc_clnt_create(
  3637.      uint32_t addr_index;
  3638.      int status;
  3639.      char machname[MAXHOSTNAMELEN + 1];
  3640. -    gid_t gids[1];
  3641.      bool_t needcb = 1;
  3642.  
  3643.      rpc = calloc(1, sizeof(nfs41_rpc_clnt));
  3644. @@ -191,12 +192,26 @@ int nfs41_rpc_clnt_create(
  3645.  
  3646.      rpc->sec_flavor = sec_flavor;
  3647.      if (sec_flavor == RPCSEC_AUTH_SYS) {
  3648. +        gid_t aup_gids[RPC_AUTHUNIX_AUP_MAX_NUM_GIDS];
  3649. +        int num_aup_gids = 0;
  3650. +
  3651.          if (gethostname(machname, sizeof(machname)) == -1) {
  3652.              eprintf("nfs41_rpc_clnt_create: gethostname failed\n");
  3653.              goto out_err_client;
  3654.          }
  3655.          machname[sizeof(machname) - 1] = '\0';
  3656. -        client->cl_auth = authsys_create(machname, uid, gid, 0, gids);
  3657. +
  3658. +        if (!fill_auth_unix_aup_gids(GetCurrentThreadToken(),
  3659. +            aup_gids, &num_aup_gids)) {
  3660. +            eprintf("nfs41_rpc_clnt_create: "
  3661. +                "fill_auth_unix_aup_gids() failed\n");
  3662. +            status = ERROR_NETWORK_UNREACHABLE;
  3663. +            goto out_err_client;
  3664. +        }
  3665. +
  3666. +        client->cl_auth = authsys_create(machname,
  3667. +            uid, gid,
  3668. +            num_aup_gids, aup_gids);
  3669.          if (client->cl_auth == NULL) {
  3670.              eprintf("nfs41_rpc_clnt_create: failed to create rpc authsys\n");
  3671.              status = ERROR_NETWORK_UNREACHABLE;
  3672. --
  3673. 2.45.1
  3674.  
  3675. From 2da86679ae2c1d0bfcb5985d12d59ef2ecd78dcd Mon Sep 17 00:00:00 2001
  3676. From: Roland Mainz <roland.mainz@nrubsig.org>
  3677. Date: Mon, 20 Jan 2025 11:05:26 +0100
  3678. Subject: [PATCH 29/44] tests: Update Solaris nfsd instructions
  3679.  
  3680. Update Solaris nfsd instructions, add NTP client+disable ZFS sync/ZIL
  3681. information.
  3682.  
  3683. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3684. ---
  3685. tests/nfs_server_setup.txt | 22 +++++++++++++++-------
  3686.  1 file changed, 15 insertions(+), 7 deletions(-)
  3687.  
  3688. diff --git a/tests/nfs_server_setup.txt b/tests/nfs_server_setup.txt
  3689. index 3577dd7..4d81277 100644
  3690. --- a/tests/nfs_server_setup.txt
  3691. +++ b/tests/nfs_server_setup.txt
  3692. @@ -45,7 +45,12 @@ C:\cygwin64\sbin\nfs_mount -o rw N nfs://192.168.209.129//
  3693.  # Solaris 11.4 NFSv4.1 server setup
  3694.  #
  3695.  
  3696. -# 1. Server setup
  3697. +##### 1. Server setup
  3698. +# enable ntp server "10.49.0.5"
  3699. +printf "server 10.49.0.5\n" >/etc/inet/ntp.conf
  3700. +svcadm enable ntp
  3701. +
  3702. +# configure&start NFS server
  3703.  svcadm enable network/nfs/server
  3704.  sharectl set -p nfsmapid_domain=global.loc nfs
  3705.  sharectl set -p server_delegation=on nfs
  3706. @@ -54,16 +59,19 @@ chmod a+rwx /nfsdata
  3707.  share -F nfs -o rw /nfsdata/
  3708.  svcs svc:/network/nfs/server:default
  3709.  
  3710. -# 2. Windows ms-nfs41-client setup:
  3711. -# Add entries for groups "sys" and "nobody"
  3712. -echo "sys:S-1-0-3:3:" >>/etc/groups
  3713. -echo "nobody:S-1-0-65534:65534:" >>/etc/group
  3714. +# performance: disable sync/ZIL on ZFS pool which exports NFS files
  3715. +zfs set sync=disabled rpool
  3716. +
  3717. +##### 2. Windows ms-nfs41-client setup:
  3718. +# Add entries for groups "sys" and "nobody" used by Solaris nfsd
  3719. +printf "sys:S-1-0-3:3:\n" >>/etc/groups
  3720. +printf "nobody:S-1-0-65534:65534:\n" >>/etc/group
  3721.  
  3722. -# 3. Misc commands:
  3723. +##### 3. Misc commands:
  3724.  ls -v filename # list ACLs
  3725.  chmod A... # to edit ACLs
  3726.  
  3727. -# 4. Troubleshooting:
  3728. +##### 4. Troubleshooting:
  3729.  See https://docs.oracle.com/en/operating-systems/solaris/oracle-solaris/11.4/manage-nfs/troubleshooting-network-file-systems1.html
  3730.  
  3731.  
  3732. --
  3733. 2.45.1
  3734.  
  3735. From b225d27cb0eb27bcf17273d79da8fc91908c40c5 Mon Sep 17 00:00:00 2001
  3736. From: Roland Mainz <roland.mainz@nrubsig.org>
  3737. Date: Mon, 20 Jan 2025 13:25:47 +0100
  3738. Subject: [PATCH 30/44] daemon,sys: |nfs3_attrs| EA |fileid| field should
  3739.  contain valid information
  3740.  
  3741. |nfs3_attrs| extended attribute |fileid| field should contain valid
  3742. information obtained from the NFSv4.1 server, and not "0".
  3743.  
  3744. Reported-by: Lionel Cons <lionelcons1972@gmail.com>
  3745. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3746. ---
  3747. daemon/open.c            | 17 +++++++++++++++--
  3748.  daemon/upcall.h          |  1 +
  3749.  sys/nfs41sys_driver.h    |  4 +++-
  3750.  sys/nfs41sys_ea.c        |  2 ++
  3751.  sys/nfs41sys_openclose.c |  9 +++++++--
  3752.  5 files changed, 28 insertions(+), 5 deletions(-)
  3753.  
  3754. diff --git a/daemon/open.c b/daemon/open.c
  3755. index 1499cf9..b51883c 100644
  3756. --- a/daemon/open.c
  3757. +++ b/daemon/open.c
  3758. @@ -780,6 +780,9 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  3759.          }
  3760.          nfs_to_basic_info(state->file.name.name, &info, &args->basic_info);
  3761.          nfs_to_standard_info(&info, &args->std_info);
  3762. +        EASSERT((info.attrmask.count > 0) &&
  3763. +            (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  3764. +        args->fileid = info.fileid;
  3765.          EASSERT((info.attrmask.count > 1) &&
  3766.              (info.attrmask.arr[1] & FATTR4_WORD1_MODE));
  3767.          args->mode = info.mode;
  3768. @@ -795,6 +798,9 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  3769.  
  3770.          nfs_to_basic_info(state->file.name.name, &info, &args->basic_info);
  3771.          nfs_to_standard_info(&info, &args->std_info);
  3772. +        EASSERT((info.attrmask.count > 0) &&
  3773. +            (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  3774. +        args->fileid = info.fileid;
  3775.          EASSERT((info.attrmask.count > 1) &&
  3776.              (info.attrmask.arr[1] & FATTR4_WORD1_MODE));
  3777.          args->mode = info.mode;
  3778. @@ -1027,6 +1033,9 @@ create_chgrp_out:
  3779.  
  3780.              nfs_to_basic_info(state->file.name.name, &info, &args->basic_info);
  3781.              nfs_to_standard_info(&info, &args->std_info);
  3782. +            EASSERT((info.attrmask.count > 0) &&
  3783. +                (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  3784. +            args->fileid = info.fileid;
  3785.              EASSERT((info.attrmask.count > 1) &&
  3786.                  (info.attrmask.arr[1] & FATTR4_WORD1_MODE));
  3787.              args->mode = info.mode;
  3788. @@ -1060,6 +1069,8 @@ static int marshall_open(unsigned char *buffer, uint32_t *length, nfs41_upcall *
  3789.      if (status) goto out;
  3790.      status = safe_write(&buffer, length, &args->std_info, sizeof(args->std_info));
  3791.      if (status) goto out;
  3792. +    status = safe_write(&buffer, length, &args->fileid, sizeof(args->fileid));
  3793. +    if (status) goto out;
  3794.      status = safe_write(&buffer, length, &upcall->state_ref, sizeof(HANDLE));
  3795.      if (status) goto out;
  3796.      status = safe_write(&buffer, length, &args->mode, sizeof(args->mode));
  3797. @@ -1089,8 +1100,10 @@ static int marshall_open(unsigned char *buffer, uint32_t *length, nfs41_upcall *
  3798.              goto out;
  3799.          }
  3800.      }
  3801. -    DPRINTF(2, ("NFS41_SYSOP_OPEN: downcall open_state=0x%p mode %o changeattr 0x%llu\n",
  3802. -        upcall->state_ref, args->mode, args->changeattr));
  3803. +    DPRINTF(2, ("NFS41_SYSOP_OPEN: downcall "
  3804. +        "open_state=0x%p fileid=0x%llx mode=0o%o changeattr=0x%llu\n",
  3805. +        upcall->state_ref, (unsigned long long)args->fileid,
  3806. +        args->mode, args->changeattr));
  3807.  out:
  3808.      return status;
  3809.  }
  3810. diff --git a/daemon/upcall.h b/daemon/upcall.h
  3811. index 5f44ede..99e7962 100644
  3812. --- a/daemon/upcall.h
  3813. +++ b/daemon/upcall.h
  3814. @@ -46,6 +46,7 @@ typedef struct __open_upcall_args {
  3815.      nfs41_abs_path symlink;
  3816.      FILE_BASIC_INFO basic_info;
  3817.      FILE_STANDARD_INFO std_info;
  3818. +    ULONGLONG fileid;
  3819.      const char *path;
  3820.      ULONG access_mask;
  3821.      ULONG access_mode;
  3822. diff --git a/sys/nfs41sys_driver.h b/sys/nfs41sys_driver.h
  3823. index 860e476..225335e 100644
  3824. --- a/sys/nfs41sys_driver.h
  3825. +++ b/sys/nfs41sys_driver.h
  3826. @@ -154,7 +154,7 @@ typedef struct _nfs3_attrs {
  3827.          DWORD specdata1;
  3828.          DWORD specdata2;
  3829.      } rdev;
  3830. -    LONGLONG fsid, fileid;
  3831. +    ULONGLONG fsid, fileid;
  3832.      LONGLONG atime, mtime, ctime;
  3833.  } nfs3_attrs;
  3834.  
  3835. @@ -231,6 +231,7 @@ typedef struct _updowncall_entry {
  3836.          struct {
  3837.              FILE_BASIC_INFORMATION binfo;
  3838.              FILE_STANDARD_INFORMATION sinfo;
  3839. +            ULONGLONG fileid;
  3840.              UNICODE_STRING symlink;
  3841.              ULONG access_mask;
  3842.              ULONG access_mode;
  3843. @@ -435,6 +436,7 @@ typedef struct _NFS41_FCB {
  3844.      NODE_BYTE_SIZE          NodeByteSize;
  3845.      FILE_BASIC_INFORMATION  BasicInfo;
  3846.      FILE_STANDARD_INFORMATION StandardInfo;
  3847. +    ULONGLONG               fileid;
  3848.      BOOLEAN                 Renamed;
  3849.      BOOLEAN                 DeletePending;
  3850.      DWORD                   mode;
  3851. diff --git a/sys/nfs41sys_ea.c b/sys/nfs41sys_ea.c
  3852. index fbd61cb..1f8fdfc 100644
  3853. --- a/sys/nfs41sys_ea.c
  3854. +++ b/sys/nfs41sys_ea.c
  3855. @@ -211,6 +211,8 @@ static void create_nfs3_attrs(
  3856.      attrs->nlink = nfs41_fcb->StandardInfo.NumberOfLinks;
  3857.      attrs->size.QuadPart = attrs->used.QuadPart =
  3858.          nfs41_fcb->StandardInfo.EndOfFile.QuadPart;
  3859. +    attrs->fsid = 0xBABAFACEBABAFACE;
  3860. +    attrs->fileid = nfs41_fcb->fileid;
  3861.      file_time_to_nfs_time(&nfs41_fcb->BasicInfo.LastAccessTime, &attrs->atime);
  3862.      file_time_to_nfs_time(&nfs41_fcb->BasicInfo.ChangeTime, &attrs->mtime);
  3863.      file_time_to_nfs_time(&nfs41_fcb->BasicInfo.CreationTime, &attrs->ctime);
  3864. diff --git a/sys/nfs41sys_openclose.c b/sys/nfs41sys_openclose.c
  3865. index d6b2767..3e8a428 100644
  3866. --- a/sys/nfs41sys_openclose.c
  3867. +++ b/sys/nfs41sys_openclose.c
  3868. @@ -265,6 +265,8 @@ NTSTATUS unmarshal_nfs41_open(
  3869.      *buf += sizeof(FILE_BASIC_INFORMATION);
  3870.      RtlCopyMemory(&cur->u.Open.sinfo, *buf, sizeof(FILE_STANDARD_INFORMATION));
  3871.      *buf += sizeof(FILE_STANDARD_INFORMATION);
  3872. +    RtlCopyMemory(&cur->u.Open.fileid, *buf, sizeof(ULONGLONG));
  3873. +    *buf += sizeof(ULONGLONG);
  3874.      RtlCopyMemory(&cur->open_state, *buf, sizeof(HANDLE));
  3875.      *buf += sizeof(HANDLE);
  3876.      RtlCopyMemory(&cur->u.Open.mode, *buf, sizeof(DWORD));
  3877. @@ -301,12 +303,14 @@ NTSTATUS unmarshal_nfs41_open(
  3878.  #endif
  3879.      }
  3880.  #ifdef DEBUG_MARSHAL_DETAIL
  3881. -    DbgP("unmarshal_nfs41_open: open_state 0x%x mode 0%o "
  3882. +    DbgP("unmarshal_nfs41_open: "
  3883. +        "open_state 0x%x fileid=0x%llx mode 0%o "
  3884.  #ifdef NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES
  3885.          "owner_local_uid %u owner_group_local_gid %u "
  3886.  #endif /* NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES */
  3887.          "changeattr %llu "
  3888. -        "deleg_type %d\n", cur->open_state, cur->u.Open.mode,
  3889. +        "deleg_type %d\n",
  3890. +        cur->open_state, cur->u.Open.fileid, cur->u.Open.mode,
  3891.  #ifdef NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES
  3892.          cur->u.Open.owner_local_uid, cur->u.Open.owner_group_local_gid,
  3893.  #endif /* NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES */
  3894. @@ -812,6 +816,7 @@ retry_on_link:
  3895.              sizeof(entry->u.Open.binfo));
  3896.          RtlCopyMemory(&nfs41_fcb->StandardInfo, &entry->u.Open.sinfo,
  3897.              sizeof(entry->u.Open.sinfo));
  3898. +        nfs41_fcb->fileid = entry->u.Open.fileid;
  3899.          nfs41_fcb->mode = entry->u.Open.mode;
  3900.  #ifdef NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES
  3901.          nfs41_fcb->owner_local_uid = entry->u.Open.owner_local_uid;
  3902. --
  3903. 2.45.1
  3904.  
  3905. From 7bd426c8475a52b68b5630569235251a87ee63dc Mon Sep 17 00:00:00 2001
  3906. From: Roland Mainz <roland.mainz@nrubsig.org>
  3907. Date: Mon, 20 Jan 2025 16:10:56 +0100
  3908. Subject: [PATCH 31/44] daemon,sys: |nfs3_attrs| EA |fsid| field should contain
  3909.  valid information
  3910.  
  3911. |nfs3_attrs| extended attribute |fsid| field should contain valid
  3912. information obtained from the NFSv4.1 server, and not "0".
  3913.  
  3914. Reported-by: Lionel Cons <lionelcons1972@gmail.com>
  3915. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3916. ---
  3917. daemon/name_cache.c       | 10 +++++++++-
  3918.  daemon/nfs41_superblock.c |  4 ++--
  3919.  daemon/open.c             | 25 +++++++++++++++++++++++--
  3920.  daemon/upcall.h           |  1 +
  3921.  sys/nfs41sys_driver.h     |  2 ++
  3922.  sys/nfs41sys_ea.c         | 12 +++++++++++-
  3923.  sys/nfs41sys_openclose.c  | 12 ++++++++++--
  3924.  7 files changed, 58 insertions(+), 8 deletions(-)
  3925.  
  3926. diff --git a/daemon/name_cache.c b/daemon/name_cache.c
  3927. index 444512b..d2b46af 100644
  3928. --- a/daemon/name_cache.c
  3929. +++ b/daemon/name_cache.c
  3930. @@ -82,6 +82,8 @@ struct attr_cache_entry {
  3931.      uint64_t                change;
  3932.      uint64_t                size;
  3933.      uint64_t                fileid;
  3934. +    uint64_t                fsid_major;
  3935. +    uint64_t                fsid_minor;
  3936.      int64_t                 time_access_s;
  3937.      int64_t                 time_create_s;
  3938.      int64_t                 time_modify_s;
  3939. @@ -295,6 +297,10 @@ static void attr_cache_update(
  3940.              entry->invalidated = 0;
  3941.              entry->expiration = UTIL_GETRELTIME() + NAME_CACHE_EXPIRATION;
  3942.          }
  3943. +        if (info->attrmask.arr[0] & FATTR4_WORD0_FSID) {
  3944. +            entry->fsid_major = info->fsid.major;
  3945. +            entry->fsid_minor = info->fsid.minor;
  3946. +        }
  3947.          if (info->attrmask.arr[0] & FATTR4_WORD0_SIZE)
  3948.              entry->size = info->size;
  3949.          if (info->attrmask.arr[0] & FATTR4_WORD0_HIDDEN)
  3950. @@ -341,7 +347,7 @@ static void copy_attrs(
  3951.  {
  3952.      dst->attrmask.count = 2;
  3953.      dst->attrmask.arr[0] = FATTR4_WORD0_TYPE | FATTR4_WORD0_CHANGE
  3954. -        | FATTR4_WORD0_SIZE | FATTR4_WORD0_FILEID
  3955. +        | FATTR4_WORD0_SIZE | FATTR4_WORD0_FSID | FATTR4_WORD0_FILEID
  3956.          | FATTR4_WORD0_HIDDEN | FATTR4_WORD0_ARCHIVE;
  3957.      dst->attrmask.arr[1] = FATTR4_WORD1_MODE
  3958.          | FATTR4_WORD1_NUMLINKS
  3959. @@ -386,6 +392,8 @@ static void copy_attrs(
  3960.          dst->owner_group = NULL;
  3961.      }
  3962.      dst->fileid = src->fileid;
  3963. +    dst->fsid.major = src->fsid_major;
  3964. +    dst->fsid.minor = src->fsid_minor;
  3965.      dst->hidden = src->hidden;
  3966.      dst->system = src->system;
  3967.      dst->archive = src->archive;
  3968. diff --git a/daemon/nfs41_superblock.c b/daemon/nfs41_superblock.c
  3969. index cfbac4d..6005dc6 100644
  3970. --- a/daemon/nfs41_superblock.c
  3971. +++ b/daemon/nfs41_superblock.c
  3972. @@ -136,8 +136,8 @@ static int get_superblock_attrs(
  3973.      superblock->default_getattr.count = 2;
  3974.      superblock->default_getattr.arr[0] = FATTR4_WORD0_TYPE
  3975.          | FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE
  3976. -        | FATTR4_WORD0_FILEID | FATTR4_WORD0_HIDDEN
  3977. -        | FATTR4_WORD0_ARCHIVE;
  3978. +        | FATTR4_WORD0_FSID | FATTR4_WORD0_FILEID
  3979. +        | FATTR4_WORD0_HIDDEN | FATTR4_WORD0_ARCHIVE;
  3980.      superblock->default_getattr.arr[1] = FATTR4_WORD1_MODE
  3981.          | FATTR4_WORD1_NUMLINKS | FATTR4_WORD1_SYSTEM
  3982.          | FATTR4_WORD1_TIME_ACCESS | FATTR4_WORD1_TIME_CREATE
  3983. diff --git a/daemon/open.c b/daemon/open.c
  3984. index b51883c..4ecad9f 100644
  3985. --- a/daemon/open.c
  3986. +++ b/daemon/open.c
  3987. @@ -783,6 +783,10 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  3988.          EASSERT((info.attrmask.count > 0) &&
  3989.              (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  3990.          args->fileid = info.fileid;
  3991. +        EASSERT((info.attrmask.count > 0) &&
  3992. +            (info.attrmask.arr[0] & FATTR4_WORD0_FSID));
  3993. +        args->fsid_major = info.fsid.major;
  3994. +        args->fsid_minor = info.fsid.minor;
  3995.          EASSERT((info.attrmask.count > 1) &&
  3996.              (info.attrmask.arr[1] & FATTR4_WORD1_MODE));
  3997.          args->mode = info.mode;
  3998. @@ -801,6 +805,10 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  3999.          EASSERT((info.attrmask.count > 0) &&
  4000.              (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  4001.          args->fileid = info.fileid;
  4002. +        EASSERT((info.attrmask.count > 0) &&
  4003. +            (info.attrmask.arr[0] & FATTR4_WORD0_FSID));
  4004. +        args->fsid_major = info.fsid.major;
  4005. +        args->fsid_minor = info.fsid.minor;
  4006.          EASSERT((info.attrmask.count > 1) &&
  4007.              (info.attrmask.arr[1] & FATTR4_WORD1_MODE));
  4008.          args->mode = info.mode;
  4009. @@ -1036,6 +1044,10 @@ create_chgrp_out:
  4010.              EASSERT((info.attrmask.count > 0) &&
  4011.                  (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  4012.              args->fileid = info.fileid;
  4013. +            EASSERT((info.attrmask.count > 0) &&
  4014. +                (info.attrmask.arr[0] & FATTR4_WORD0_FSID));
  4015. +            args->fsid_major = info.fsid.major;
  4016. +            args->fsid_minor = info.fsid.minor;
  4017.              EASSERT((info.attrmask.count > 1) &&
  4018.                  (info.attrmask.arr[1] & FATTR4_WORD1_MODE));
  4019.              args->mode = info.mode;
  4020. @@ -1071,6 +1083,10 @@ static int marshall_open(unsigned char *buffer, uint32_t *length, nfs41_upcall *
  4021.      if (status) goto out;
  4022.      status = safe_write(&buffer, length, &args->fileid, sizeof(args->fileid));
  4023.      if (status) goto out;
  4024. +    status = safe_write(&buffer, length, &args->fsid_major, sizeof(args->fsid_major));
  4025. +    if (status) goto out;
  4026. +    status = safe_write(&buffer, length, &args->fsid_minor, sizeof(args->fsid_minor));
  4027. +    if (status) goto out;
  4028.      status = safe_write(&buffer, length, &upcall->state_ref, sizeof(HANDLE));
  4029.      if (status) goto out;
  4030.      status = safe_write(&buffer, length, &args->mode, sizeof(args->mode));
  4031. @@ -1101,8 +1117,13 @@ static int marshall_open(unsigned char *buffer, uint32_t *length, nfs41_upcall *
  4032.          }
  4033.      }
  4034.      DPRINTF(2, ("NFS41_SYSOP_OPEN: downcall "
  4035. -        "open_state=0x%p fileid=0x%llx mode=0o%o changeattr=0x%llu\n",
  4036. -        upcall->state_ref, (unsigned long long)args->fileid,
  4037. +        "open_state=0x%p "
  4038. +        "fileid=0x%llx fsid=(0x%llx.0x%llx) "
  4039. +        "mode=0o%o changeattr=0x%llu\n",
  4040. +        upcall->state_ref,
  4041. +        (unsigned long long)args->fileid,
  4042. +        (unsigned long long)args->fsid_major,
  4043. +        (unsigned long long)args->fsid_minor,
  4044.          args->mode, args->changeattr));
  4045.  out:
  4046.      return status;
  4047. diff --git a/daemon/upcall.h b/daemon/upcall.h
  4048. index 99e7962..fc0ab74 100644
  4049. --- a/daemon/upcall.h
  4050. +++ b/daemon/upcall.h
  4051. @@ -47,6 +47,7 @@ typedef struct __open_upcall_args {
  4052.      FILE_BASIC_INFO basic_info;
  4053.      FILE_STANDARD_INFO std_info;
  4054.      ULONGLONG fileid;
  4055. +    ULONGLONG fsid_major, fsid_minor;
  4056.      const char *path;
  4057.      ULONG access_mask;
  4058.      ULONG access_mode;
  4059. diff --git a/sys/nfs41sys_driver.h b/sys/nfs41sys_driver.h
  4060. index 225335e..911e1cc 100644
  4061. --- a/sys/nfs41sys_driver.h
  4062. +++ b/sys/nfs41sys_driver.h
  4063. @@ -232,6 +232,7 @@ typedef struct _updowncall_entry {
  4064.              FILE_BASIC_INFORMATION binfo;
  4065.              FILE_STANDARD_INFORMATION sinfo;
  4066.              ULONGLONG fileid;
  4067. +            ULONGLONG fsid_major, fsid_minor;
  4068.              UNICODE_STRING symlink;
  4069.              ULONG access_mask;
  4070.              ULONG access_mode;
  4071. @@ -437,6 +438,7 @@ typedef struct _NFS41_FCB {
  4072.      FILE_BASIC_INFORMATION  BasicInfo;
  4073.      FILE_STANDARD_INFORMATION StandardInfo;
  4074.      ULONGLONG               fileid;
  4075. +    ULONGLONG               fsid_major, fsid_minor;
  4076.      BOOLEAN                 Renamed;
  4077.      BOOLEAN                 DeletePending;
  4078.      DWORD                   mode;
  4079. diff --git a/sys/nfs41sys_ea.c b/sys/nfs41sys_ea.c
  4080. index 1f8fdfc..cb3e708 100644
  4081. --- a/sys/nfs41sys_ea.c
  4082. +++ b/sys/nfs41sys_ea.c
  4083. @@ -211,7 +211,17 @@ static void create_nfs3_attrs(
  4084.      attrs->nlink = nfs41_fcb->StandardInfo.NumberOfLinks;
  4085.      attrs->size.QuadPart = attrs->used.QuadPart =
  4086.          nfs41_fcb->StandardInfo.EndOfFile.QuadPart;
  4087. -    attrs->fsid = 0xBABAFACEBABAFACE;
  4088. +    /*
  4089. +     * NFSv4.1 |nfs41_fsid| contains two 64bit fields (|major|,
  4090. +     * |minor|), but the |nfs3_attrs.fsid| field is only one 64bit
  4091. +     * value.
  4092. +     *
  4093. +     * For now we XOR both |nfs41_fsid.major|^|nfs41_fsid.minor|
  4094. +     * to avoid loosing data and to deal with NFSv4.1 filesystems
  4095. +     * which might have |0| in either |nfs41_fsid.major| or
  4096. +     * |nfs41_fsid.minor|.
  4097. +     */
  4098. +    attrs->fsid = nfs41_fcb->fsid_major ^ nfs41_fcb->fsid_minor;
  4099.      attrs->fileid = nfs41_fcb->fileid;
  4100.      file_time_to_nfs_time(&nfs41_fcb->BasicInfo.LastAccessTime, &attrs->atime);
  4101.      file_time_to_nfs_time(&nfs41_fcb->BasicInfo.ChangeTime, &attrs->mtime);
  4102. diff --git a/sys/nfs41sys_openclose.c b/sys/nfs41sys_openclose.c
  4103. index 3e8a428..4398d2a 100644
  4104. --- a/sys/nfs41sys_openclose.c
  4105. +++ b/sys/nfs41sys_openclose.c
  4106. @@ -267,6 +267,10 @@ NTSTATUS unmarshal_nfs41_open(
  4107.      *buf += sizeof(FILE_STANDARD_INFORMATION);
  4108.      RtlCopyMemory(&cur->u.Open.fileid, *buf, sizeof(ULONGLONG));
  4109.      *buf += sizeof(ULONGLONG);
  4110. +    RtlCopyMemory(&cur->u.Open.fsid_major, *buf, sizeof(ULONGLONG));
  4111. +    *buf += sizeof(ULONGLONG);
  4112. +    RtlCopyMemory(&cur->u.Open.fsid_minor, *buf, sizeof(ULONGLONG));
  4113. +    *buf += sizeof(ULONGLONG);
  4114.      RtlCopyMemory(&cur->open_state, *buf, sizeof(HANDLE));
  4115.      *buf += sizeof(HANDLE);
  4116.      RtlCopyMemory(&cur->u.Open.mode, *buf, sizeof(DWORD));
  4117. @@ -304,13 +308,15 @@ NTSTATUS unmarshal_nfs41_open(
  4118.      }
  4119.  #ifdef DEBUG_MARSHAL_DETAIL
  4120.      DbgP("unmarshal_nfs41_open: "
  4121. -        "open_state 0x%x fileid=0x%llx mode 0%o "
  4122. +        "open_state 0x%x fileid=0x%llx fsid=(0x%llx.0x%llx) mode 0%o "
  4123.  #ifdef NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES
  4124.          "owner_local_uid %u owner_group_local_gid %u "
  4125.  #endif /* NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES */
  4126.          "changeattr %llu "
  4127.          "deleg_type %d\n",
  4128. -        cur->open_state, cur->u.Open.fileid, cur->u.Open.mode,
  4129. +        cur->open_state, cur->u.Open.fileid,
  4130. +        cur->u.Open.fsid_major, cur->u.Open.fsid_minor,
  4131. +        cur->u.Open.mode,
  4132.  #ifdef NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES
  4133.          cur->u.Open.owner_local_uid, cur->u.Open.owner_group_local_gid,
  4134.  #endif /* NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES */
  4135. @@ -817,6 +823,8 @@ retry_on_link:
  4136.          RtlCopyMemory(&nfs41_fcb->StandardInfo, &entry->u.Open.sinfo,
  4137.              sizeof(entry->u.Open.sinfo));
  4138.          nfs41_fcb->fileid = entry->u.Open.fileid;
  4139. +        nfs41_fcb->fsid_major = entry->u.Open.fsid_major;
  4140. +        nfs41_fcb->fsid_minor = entry->u.Open.fsid_minor;
  4141.          nfs41_fcb->mode = entry->u.Open.mode;
  4142.  #ifdef NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES
  4143.          nfs41_fcb->owner_local_uid = entry->u.Open.owner_local_uid;
  4144. --
  4145. 2.45.1
  4146.  
  4147. From bc755c67c160d504707304ffb87adfb81c03fbd6 Mon Sep 17 00:00:00 2001
  4148. From: Roland Mainz <roland.mainz@nrubsig.org>
  4149. Date: Tue, 21 Jan 2025 13:58:13 +0100
  4150. Subject: [PATCH 32/44] include,sys,tests: Move |nfs3_attrs| to
  4151.  include/nfs_ea.h
  4152.  
  4153. Move |nfs3_attrs| to include/nfs_ea.h and switch all users of
  4154. |nfs3_attr| over to use that header.
  4155.  
  4156. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  4157. ---
  4158. include/nfs_ea.h             | 24 +++++++++++++++++++++-
  4159.  sys/nfs41sys_driver.h        | 21 -------------------
  4160.  tests/ea/Makefile            |  4 ++--
  4161.  tests/ea/main.c              | 13 ++----------
  4162.  tests/winfsinfo1/Makefile    |  4 ++--
  4163.  tests/winfsinfo1/winfsinfo.c | 40 ++++++++++++++++++------------------
  4164.  6 files changed, 49 insertions(+), 57 deletions(-)
  4165.  
  4166. diff --git a/include/nfs_ea.h b/include/nfs_ea.h
  4167. index aaf36c0..38965d6 100644
  4168. --- a/include/nfs_ea.h
  4169. +++ b/include/nfs_ea.h
  4170. @@ -1,6 +1,6 @@
  4171.  /*
  4172.   * NFSv4.1 client for Windows
  4173. - * Copyright (C) 2024 Roland Mainz <roland.mainz@nrubsig.org>
  4174. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  4175.   *
  4176.   * Roland Mainz <roland.mainz@nrubsig.org>
  4177.   *
  4178. @@ -35,4 +35,26 @@
  4179.  #define EA_NFSACTONLINK "NfsActOnLink"
  4180.  #define EA_NFSACTONLINK_LEN (11)
  4181.  
  4182. +/* NfsV3Attributes uses |nfs3_attrs| as content */
  4183. +typedef struct _nfs3_attrs {
  4184. +    DWORD type, mode, nlink, uid, gid, filler1;
  4185. +    LARGE_INTEGER size, used;
  4186. +    struct {
  4187. +        DWORD specdata1;
  4188. +        DWORD specdata2;
  4189. +    } rdev;
  4190. +    ULONGLONG fsid, fileid;
  4191. +    LONGLONG atime, mtime, ctime;
  4192. +} nfs3_attrs;
  4193. +
  4194. +enum ftype3 {
  4195. +    NF3REG = 1,
  4196. +    NF3DIR,
  4197. +    NF3BLK,
  4198. +    NF3CHR,
  4199. +    NF3LNK,
  4200. +    NF3SOCK,
  4201. +    NF3FIFO
  4202. +};
  4203. +
  4204.  #endif /* !__NFS41_DAEMON_NFSV4_EA */
  4205. diff --git a/sys/nfs41sys_driver.h b/sys/nfs41sys_driver.h
  4206. index 911e1cc..8bb88bc 100644
  4207. --- a/sys/nfs41sys_driver.h
  4208. +++ b/sys/nfs41sys_driver.h
  4209. @@ -147,27 +147,6 @@ extern nfs41_timings getexattr;
  4210.  #define MILLISECONDS(milli) (((signed __int64)(milli)) * MICROSECONDS(1000L))
  4211.  #define SECONDS(seconds) (((signed __int64)(seconds)) * MILLISECONDS(1000L))
  4212.  
  4213. -typedef struct _nfs3_attrs {
  4214. -    DWORD type, mode, nlink, uid, gid, filler1;
  4215. -    LARGE_INTEGER size, used;
  4216. -    struct {
  4217. -        DWORD specdata1;
  4218. -        DWORD specdata2;
  4219. -    } rdev;
  4220. -    ULONGLONG fsid, fileid;
  4221. -    LONGLONG atime, mtime, ctime;
  4222. -} nfs3_attrs;
  4223. -
  4224. -enum ftype3 {
  4225. -    NF3REG = 1,
  4226. -    NF3DIR,
  4227. -    NF3BLK,
  4228. -    NF3CHR,
  4229. -    NF3LNK,
  4230. -    NF3SOCK,
  4231. -    NF3FIFO
  4232. -};
  4233. -
  4234.  typedef enum _nfs41_updowncall_state {
  4235.      NFS41_WAITING_FOR_UPCALL,
  4236.      NFS41_WAITING_FOR_DOWNCALL,
  4237. diff --git a/tests/ea/Makefile b/tests/ea/Makefile
  4238. index 480449b..65e58a3 100644
  4239. --- a/tests/ea/Makefile
  4240. +++ b/tests/ea/Makefile
  4241. @@ -7,10 +7,10 @@
  4242.  all: nfs_ea.i686.exe nfs_ea.x86_64.exe nfs_ea.exe
  4243.  
  4244.  nfs_ea.i686.exe: main.c
  4245. -       clang -target i686-pc-windows-gnu -std=gnu17 -municode -Wall -Wextra -D_CRT_STDIO_ISO_WIDE_SPECIFIERS=1 -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -g main.c -lntdll -o nfs_ea.i686.exe
  4246. +       clang -target i686-pc-windows-gnu -std=gnu17 -municode -Wall -Wextra -D_CRT_STDIO_ISO_WIDE_SPECIFIERS=1 -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -I../../include -g main.c -lntdll -o nfs_ea.i686.exe
  4247.  
  4248.  nfs_ea.x86_64.exe: main.c
  4249. -       clang -target x86_64-pc-windows-gnu -std=gnu17 -municode -Wall -Wextra -D_CRT_STDIO_ISO_WIDE_SPECIFIERS=1 -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -g main.c -lntdll -o nfs_ea.x86_64.exe
  4250. +       clang -target x86_64-pc-windows-gnu -std=gnu17 -municode -Wall -Wextra -D_CRT_STDIO_ISO_WIDE_SPECIFIERS=1 -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -I../../include -g main.c -lntdll -o nfs_ea.x86_64.exe
  4251.  
  4252.  nfs_ea.exe: nfs_ea.x86_64.exe
  4253.         rm -f nfs_ea.exe
  4254. diff --git a/tests/ea/main.c b/tests/ea/main.c
  4255. index 507bc12..2f1596f 100644
  4256. --- a/tests/ea/main.c
  4257. +++ b/tests/ea/main.c
  4258. @@ -36,6 +36,8 @@
  4259.  typedef unsigned long DWORD, *PDWORD, *LPDWORD;
  4260.  #endif
  4261.  
  4262. +#include "nfs_ea.h"
  4263. +
  4264.  #define MAX_LIST_LEN 4096
  4265.  #define MAX_EA_VALUE 256
  4266.  
  4267. @@ -158,17 +160,6 @@ out:
  4268.      return status;
  4269.  }
  4270.  
  4271. -typedef struct _nfs3_attrs {
  4272. -    DWORD type, mode, nlink, uid, gid, filler1;
  4273. -    LARGE_INTEGER size, used;
  4274. -    struct {
  4275. -        DWORD specdata1;
  4276. -        DWORD specdata2;
  4277. -    } rdev;
  4278. -    LONGLONG fsid, fileid;
  4279. -    LONGLONG atime, mtime, ctime;
  4280. -} nfs3_attrs;
  4281. -
  4282.  static NTSTATUS ea_get_nfs3attr(
  4283.      HANDLE FileHandle)
  4284.  {
  4285. diff --git a/tests/winfsinfo1/Makefile b/tests/winfsinfo1/Makefile
  4286. index b0b8d93..6ef7039 100644
  4287. --- a/tests/winfsinfo1/Makefile
  4288. +++ b/tests/winfsinfo1/Makefile
  4289. @@ -7,10 +7,10 @@
  4290.  all: winfsinfo.i686.exe winfsinfo.x86_64.exe winfsinfo.exe
  4291.  
  4292.  winfsinfo.i686.exe: winfsinfo.c
  4293. -       clang -target i686-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g winfsinfo.c -lntdll -o winfsinfo.i686.exe
  4294. +       clang -target i686-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winfsinfo.c -lntdll -o winfsinfo.i686.exe
  4295.  
  4296.  winfsinfo.x86_64.exe: winfsinfo.c
  4297. -       clang -target x86_64-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g winfsinfo.c -lntdll -o winfsinfo.x86_64.exe
  4298. +       clang -target x86_64-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winfsinfo.c -lntdll -o winfsinfo.x86_64.exe
  4299.  
  4300.  winfsinfo.exe: winfsinfo.x86_64.exe
  4301.         ln -s winfsinfo.x86_64.exe winfsinfo.exe
  4302. diff --git a/tests/winfsinfo1/winfsinfo.c b/tests/winfsinfo1/winfsinfo.c
  4303. index 7b80ea4..1756b6f 100644
  4304. --- a/tests/winfsinfo1/winfsinfo.c
  4305. +++ b/tests/winfsinfo1/winfsinfo.c
  4306. @@ -1,7 +1,7 @@
  4307.  /*
  4308.   * MIT License
  4309.   *
  4310. - * Copyright (c) 2023-2024 Roland Mainz <roland.mainz@nrubsig.org>
  4311. + * Copyright (c) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org>
  4312.   *
  4313.   * Permission is hereby granted, free of charge, to any person obtaining a copy
  4314.   * of this software and associated documentation files (the "Software"), to deal
  4315. @@ -38,6 +38,8 @@
  4316.  #include <stdint.h>
  4317.  #include <stdbool.h>
  4318.  
  4319. +#include "nfs_ea.h"
  4320. +
  4321.  static
  4322.  bool filetime2localsystemtime(const FILETIME *ft, SYSTEMTIME *st)
  4323.  {
  4324. @@ -622,19 +624,6 @@ done:
  4325.      return res;
  4326.  }
  4327.  
  4328. -typedef struct _nfs3_attrs {
  4329. -    DWORD type, mode, nlink, uid, gid, filler1;
  4330. -    LARGE_INTEGER size, used;
  4331. -    struct {
  4332. -        DWORD specdata1;
  4333. -        DWORD specdata2;
  4334. -    } rdev;
  4335. -    LONGLONG fsid, fileid;
  4336. -    LONGLONG atime, mtime, ctime;
  4337. -} nfs3_attrs;
  4338. -
  4339. -#define NfsV3Attributes_NAME "NfsV3Attributes"
  4340. -
  4341.  typedef struct _FILE_EA_INFORMATION {
  4342.      ULONG EaSize;
  4343.  } FILE_EA_INFORMATION, *PFILE_EA_INFORMATION;
  4344. @@ -697,11 +686,11 @@ bool get_getnfs3attr(const char *progname, const char *filename)
  4345.  
  4346.      struct {
  4347.          FILE_FULL_EA_INFORMATION ffeai;
  4348. -        char buf[sizeof(NfsV3Attributes_NAME) + sizeof(nfs3_attrs)];
  4349. +        char buf[sizeof(EA_NFSV3ATTRIBUTES) + sizeof(nfs3_attrs)];
  4350.      } ffeai_buf;
  4351.      struct {
  4352.          FILE_GET_EA_INFORMATION fgeai;
  4353. -        char buf[sizeof(NfsV3Attributes_NAME)];
  4354. +        char buf[sizeof(EA_NFSV3ATTRIBUTES)];
  4355.      } fgeai_buf;
  4356.  
  4357.      NTSTATUS status;
  4358. @@ -709,7 +698,7 @@ bool get_getnfs3attr(const char *progname, const char *filename)
  4359.  
  4360.      fgeai_buf.fgeai.NextEntryOffset = 0;
  4361.      fgeai_buf.fgeai.EaNameLength = 15;
  4362. -    (void)strcpy(fgeai_buf.fgeai.EaName, NfsV3Attributes_NAME);
  4363. +    (void)strcpy(fgeai_buf.fgeai.EaName, EA_NFSV3ATTRIBUTES);
  4364.  
  4365.      status = ZwQueryEaFile(fileHandle, &io,
  4366.          &ffeai_buf.ffeai, sizeof(ffeai_buf), TRUE,
  4367. @@ -728,6 +717,17 @@ bool get_getnfs3attr(const char *progname, const char *filename)
  4368.              goto done;
  4369.      }
  4370.  
  4371. +    if (ffeai_buf.ffeai.EaValueLength < sizeof(nfs3_attrs)) {
  4372. +            (void)fprintf(stderr,
  4373. +                "EA '%s' size too small (%ld bytes), "
  4374. +                "expected at least %ld bytes for nfs3_attrs\n",
  4375. +                EA_NFSV3ATTRIBUTES,
  4376. +                (long)ffeai_buf.ffeai.EaValueLength,
  4377. +                (long)sizeof(nfs3_attrs));
  4378. +            res = EXIT_FAILURE;
  4379. +            goto done;
  4380. +    }
  4381. +
  4382.      nfs3_attrs *n3a = (nfs3_attrs *)(ffeai_buf.ffeai.EaName
  4383.          + ffeai_buf.ffeai.EaNameLength + 1);
  4384.  
  4385. @@ -740,7 +740,7 @@ bool get_getnfs3attr(const char *progname, const char *filename)
  4386.          "\tuid=%d\n\tgid=%d\n"
  4387.          "\tsize=%lld\n\tused=%lld\n"
  4388.          "\trdev=( specdata1=0x%x specdata2=0x%x )\n"
  4389. -        "\tfsid=%lld\n\tfileid=%lld\n"
  4390. +        "\tfsid=0x%llx\n\tfileid=0x%llx\n"
  4391.          "\tatime=%lld\n\tmtime=%lld\n\tctime=%lld\n"
  4392.          ")\n",
  4393.          filename,
  4394. @@ -753,8 +753,8 @@ bool get_getnfs3attr(const char *progname, const char *filename)
  4395.          (long long)n3a->used.QuadPart,
  4396.          (int)n3a->rdev.specdata1,
  4397.          (int)n3a->rdev.specdata2,
  4398. -        (long long)n3a->fsid,
  4399. -        (long long)n3a->fileid,
  4400. +        (unsigned long long)n3a->fsid,
  4401. +        (unsigned long long)n3a->fileid,
  4402.          (long long)n3a->atime,
  4403.          (long long)n3a->mtime,
  4404.          (long long)n3a->ctime);
  4405. --
  4406. 2.45.1
  4407.  
  4408. From c4c4c6c7796d39378f60ebb1ae56e69eca2c833d Mon Sep 17 00:00:00 2001
  4409. From: Roland Mainz <roland.mainz@nrubsig.org>
  4410. Date: Tue, 21 Jan 2025 14:04:20 +0100
  4411. Subject: [PATCH 33/44] tests: Rename winfsinfo getnfs3attr to nfs3attr
  4412.  
  4413. Rename winfsinfo getnfs3attr to nfs3attr to be consistent with
  4414. other command names.
  4415.  
  4416. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  4417. ---
  4418. tests/winfsinfo1/winfsinfo.c | 8 ++++----
  4419.  1 file changed, 4 insertions(+), 4 deletions(-)
  4420.  
  4421. diff --git a/tests/winfsinfo1/winfsinfo.c b/tests/winfsinfo1/winfsinfo.c
  4422. index 1756b6f..f60a89b 100644
  4423. --- a/tests/winfsinfo1/winfsinfo.c
  4424. +++ b/tests/winfsinfo1/winfsinfo.c
  4425. @@ -668,7 +668,7 @@ ZwQueryEaFile(
  4426.    IN BOOLEAN RestartScan);
  4427.  
  4428.  static
  4429. -bool get_getnfs3attr(const char *progname, const char *filename)
  4430. +bool get_nfs3attr(const char *progname, const char *filename)
  4431.  {
  4432.      int res = EXIT_FAILURE;
  4433.  
  4434. @@ -777,7 +777,7 @@ void usage(void)
  4435.          "filenormalizednameinfo|"
  4436.          "filecasesensitiveinfo|"
  4437.          "getfiletime|"
  4438. -        "getnfs3attr"
  4439. +        "nfs3attr"
  4440.          "> path\n");
  4441.  }
  4442.  
  4443. @@ -816,8 +816,8 @@ int main(int ac, char *av[])
  4444.      else if (!strcmp(subcmd, "filecasesensitiveinfo")) {
  4445.          return get_filecasesensitiveinfo(av[0], av[2]);
  4446.      }
  4447. -    else if (!strcmp(subcmd, "getnfs3attr")) {
  4448. -        return get_getnfs3attr(av[0], av[2]);
  4449. +    else if (!strcmp(subcmd, "nfs3attr")) {
  4450. +        return get_nfs3attr(av[0], av[2]);
  4451.      }
  4452.      else {
  4453.          (void)fprintf(stderr, "%s: Unknown subcmd '%s'\n", av[0], subcmd);
  4454. --
  4455. 2.45.1
  4456.  
  4457. From 975726a8f52d4a60da366bb2e286a78a8344b17f Mon Sep 17 00:00:00 2001
  4458. From: Roland Mainz <roland.mainz@nrubsig.org>
  4459. Date: Tue, 21 Jan 2025 16:13:49 +0100
  4460. Subject: [PATCH 34/44] include,sys,tests: |nfs3_attrs| should use fixed-size,
  4461.  simple integer datatypes
  4462.  
  4463. |nfs3_attrs| should use fixed-size, simple integer datatypes.
  4464.  
  4465. Note that <stdint.h> cannot be used because the Windows kernel API
  4466. is incompatible with the VS19 version of that header, so we use simple
  4467. Windows Types for this.
  4468.  
  4469. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  4470. ---
  4471. include/nfs_ea.h             | 21 ++++++++++++++-------
  4472.  sys/nfs41sys_ea.c            |  4 ++--
  4473.  tests/ea/main.c              |  4 ++--
  4474.  tests/winfsinfo1/winfsinfo.c |  4 ++--
  4475.  4 files changed, 20 insertions(+), 13 deletions(-)
  4476.  
  4477. diff --git a/include/nfs_ea.h b/include/nfs_ea.h
  4478. index 38965d6..e546e79 100644
  4479. --- a/include/nfs_ea.h
  4480. +++ b/include/nfs_ea.h
  4481. @@ -35,16 +35,23 @@
  4482.  #define EA_NFSACTONLINK "NfsActOnLink"
  4483.  #define EA_NFSACTONLINK_LEN (11)
  4484.  
  4485. -/* NfsV3Attributes uses |nfs3_attrs| as content */
  4486. +/*
  4487. + * "NfsV3Attributes" uses |nfs3_attrs| as content
  4488. + */
  4489. +/*
  4490. + * Note that we cannot use <stdint.h> in the Windows kernel, so we
  4491. + * use Windows Types here
  4492. + */
  4493. +
  4494.  typedef struct _nfs3_attrs {
  4495. -    DWORD type, mode, nlink, uid, gid, filler1;
  4496. -    LARGE_INTEGER size, used;
  4497. +    UINT32 type, mode, nlink, uid, gid, filler1;
  4498. +    UINT64 size, used;
  4499.      struct {
  4500. -        DWORD specdata1;
  4501. -        DWORD specdata2;
  4502. +        UINT32 specdata1;
  4503. +        UINT32 specdata2;
  4504.      } rdev;
  4505. -    ULONGLONG fsid, fileid;
  4506. -    LONGLONG atime, mtime, ctime;
  4507. +    UINT64 fsid, fileid;
  4508. +    INT64 atime, mtime, ctime;
  4509.  } nfs3_attrs;
  4510.  
  4511.  enum ftype3 {
  4512. diff --git a/sys/nfs41sys_ea.c b/sys/nfs41sys_ea.c
  4513. index cb3e708..cbc8ca2 100644
  4514. --- a/sys/nfs41sys_ea.c
  4515. +++ b/sys/nfs41sys_ea.c
  4516. @@ -177,7 +177,7 @@ static void print_nfs3_attrs(
  4517.      DbgP("type=%d mode=0%o nlink=%d size=%lld "
  4518.          "atime=0x%llx mtime=0x%llx ctime=0x%llx\n",
  4519.          attrs->type, attrs->mode, attrs->nlink,
  4520. -        (long long)attrs->size.QuadPart,
  4521. +        (long long)attrs->size,
  4522.          (long long)attrs->atime,
  4523.          (long long)attrs->mtime,
  4524.          (long long)attrs->ctime);
  4525. @@ -209,7 +209,7 @@ static void create_nfs3_attrs(
  4526.      attrs->gid = nfs41_fcb->owner_group_local_gid;
  4527.  #endif /* NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES */
  4528.      attrs->nlink = nfs41_fcb->StandardInfo.NumberOfLinks;
  4529. -    attrs->size.QuadPart = attrs->used.QuadPart =
  4530. +    attrs->size = attrs->used =
  4531.          nfs41_fcb->StandardInfo.EndOfFile.QuadPart;
  4532.      /*
  4533.       * NFSv4.1 |nfs41_fsid| contains two 64bit fields (|major|,
  4534. diff --git a/tests/ea/main.c b/tests/ea/main.c
  4535. index 2f1596f..ade7816 100644
  4536. --- a/tests/ea/main.c
  4537. +++ b/tests/ea/main.c
  4538. @@ -214,8 +214,8 @@ static NTSTATUS ea_get_nfs3attr(
  4539.          (int)n3a->nlink,
  4540.          (int)n3a->uid,
  4541.          (int)n3a->gid,
  4542. -        (long long)n3a->size.QuadPart,
  4543. -        (long long)n3a->used.QuadPart,
  4544. +        (long long)n3a->size,
  4545. +        (long long)n3a->used,
  4546.          (int)n3a->rdev.specdata1,
  4547.          (int)n3a->rdev.specdata2,
  4548.          (long long)n3a->fsid,
  4549. diff --git a/tests/winfsinfo1/winfsinfo.c b/tests/winfsinfo1/winfsinfo.c
  4550. index f60a89b..569dcd5 100644
  4551. --- a/tests/winfsinfo1/winfsinfo.c
  4552. +++ b/tests/winfsinfo1/winfsinfo.c
  4553. @@ -749,8 +749,8 @@ bool get_nfs3attr(const char *progname, const char *filename)
  4554.          (int)n3a->nlink,
  4555.          (int)n3a->uid,
  4556.          (int)n3a->gid,
  4557. -        (long long)n3a->size.QuadPart,
  4558. -        (long long)n3a->used.QuadPart,
  4559. +        (long long)n3a->size,
  4560. +        (long long)n3a->used,
  4561.          (int)n3a->rdev.specdata1,
  4562.          (int)n3a->rdev.specdata2,
  4563.          (unsigned long long)n3a->fsid,
  4564. --
  4565. 2.45.1
  4566.  
  4567. From b725f2009b39bd7feae744b454befdbadb88c9b2 Mon Sep 17 00:00:00 2001
  4568. From: Roland Mainz <roland.mainz@nrubsig.org>
  4569. Date: Tue, 21 Jan 2025 16:42:45 +0100
  4570. Subject: [PATCH 35/44] include,sys,tests: Add support for sub-second
  4571.  timestamps in |nfs3_attrs| EA
  4572.  
  4573. Add support for sub-second (NFSv4 uses nanosecond resolution,
  4574. but the Win32 API only supports 100ns intervals) timestamps in
  4575. |nfs3_attrs| EA.
  4576.  
  4577. Reported-by: Lionel Cons <lionelcons1972@gmail.com>
  4578. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  4579. ---
  4580. include/nfs_ea.h             |  6 +++++-
  4581.  sys/nfs41sys_ea.c            | 21 +++++++++++++++------
  4582.  tests/ea/main.c              | 10 ++++++----
  4583.  tests/winfsinfo1/winfsinfo.c | 10 ++++++----
  4584.  4 files changed, 32 insertions(+), 15 deletions(-)
  4585.  
  4586. diff --git a/include/nfs_ea.h b/include/nfs_ea.h
  4587. index e546e79..e582a92 100644
  4588. --- a/include/nfs_ea.h
  4589. +++ b/include/nfs_ea.h
  4590. @@ -42,6 +42,10 @@
  4591.   * Note that we cannot use <stdint.h> in the Windows kernel, so we
  4592.   * use Windows Types here
  4593.   */
  4594. +typedef struct _nfs3_attrs_timestruc_t {
  4595. +    INT32   tv_sec;
  4596. +    UINT32  tv_nsec;
  4597. +} nfs3_attrs_timestruc_t;
  4598.  
  4599.  typedef struct _nfs3_attrs {
  4600.      UINT32 type, mode, nlink, uid, gid, filler1;
  4601. @@ -51,7 +55,7 @@ typedef struct _nfs3_attrs {
  4602.          UINT32 specdata2;
  4603.      } rdev;
  4604.      UINT64 fsid, fileid;
  4605. -    INT64 atime, mtime, ctime;
  4606. +    nfs3_attrs_timestruc_t atime, mtime, ctime;
  4607.  } nfs3_attrs;
  4608.  
  4609.  enum ftype3 {
  4610. diff --git a/sys/nfs41sys_ea.c b/sys/nfs41sys_ea.c
  4611. index cbc8ca2..51e1bf0 100644
  4612. --- a/sys/nfs41sys_ea.c
  4613. +++ b/sys/nfs41sys_ea.c
  4614. @@ -175,21 +175,30 @@ static void print_nfs3_attrs(
  4615.      nfs3_attrs *attrs)
  4616.  {
  4617.      DbgP("type=%d mode=0%o nlink=%d size=%lld "
  4618. -        "atime=0x%llx mtime=0x%llx ctime=0x%llx\n",
  4619. +        "atime=(tv_sec=%ld,tv_nsec=%lu) "
  4620. +        "mtime=(tv_sec=%ld,tv_nsec=%lu) "
  4621. +        "ctime=(tv_sec=%ld,tv_nsec=%lu)\n",
  4622.          attrs->type, attrs->mode, attrs->nlink,
  4623.          (long long)attrs->size,
  4624. -        (long long)attrs->atime,
  4625. -        (long long)attrs->mtime,
  4626. -        (long long)attrs->ctime);
  4627. +        (long)attrs->atime.tv_sec, (unsigned long)attrs->atime.tv_nsec,
  4628. +        (long)attrs->mtime.tv_sec, (unsigned long)attrs->mtime.tv_nsec,
  4629. +        (long)attrs->ctime.tv_sec, (unsigned long)attrs->ctime.tv_nsec);
  4630.  }
  4631.  
  4632.  static void file_time_to_nfs_time(
  4633.      IN const PLARGE_INTEGER file_time,
  4634. -    OUT LONGLONG *nfs_time)
  4635. +    OUT nfs3_attrs_timestruc_t *nfs_time)
  4636.  {
  4637. +    /*
  4638. +     * Win32 timestamps (|time_file|) use 100-nanosecond intervals
  4639. +     * (10000000 intervals == one second) since January 1, 1601 (UTC),
  4640. +     * while "old UNIX" timestamps count in seconds since 00:00:00 UTC
  4641. +     * on 1 January 1970
  4642. +     */
  4643.      LARGE_INTEGER diff = unix_time_diff;
  4644.      diff.QuadPart = file_time->QuadPart - diff.QuadPart;
  4645. -    *nfs_time = diff.QuadPart / 10000000;
  4646. +    nfs_time->tv_sec  = (INT32)(diff.QuadPart / 10000000LL);
  4647. +    nfs_time->tv_nsec = (UINT32)((diff.QuadPart % 10000000LL) * 100LL);
  4648.  }
  4649.  
  4650.  static void create_nfs3_attrs(
  4651. diff --git a/tests/ea/main.c b/tests/ea/main.c
  4652. index ade7816..7492edb 100644
  4653. --- a/tests/ea/main.c
  4654. +++ b/tests/ea/main.c
  4655. @@ -207,7 +207,9 @@ static NTSTATUS ea_get_nfs3attr(
  4656.          "\tsize=%lld\n\tused=%lld\n"
  4657.          "\trdev=( specdata1=0x%x specdata2=0x%x )\n"
  4658.          "\tfsid=%lld\n\tfileid=%lld\n"
  4659. -        "\tatime=%lld\n\tmtime=%lld\n\tctime=%lld\n"
  4660. +        "\tatime=(tv_sec=%ld,tv_nsec=%lu)\n"
  4661. +        "\tmtime=(tv_sec=%ld,tv_nsec=%lu)\n"
  4662. +        "\tctime=(tv_sec=%ld,tv_nsec=%lu)\n"
  4663.          ")\n",
  4664.          (int)n3a->type,
  4665.          (int)n3a->mode,
  4666. @@ -220,9 +222,9 @@ static NTSTATUS ea_get_nfs3attr(
  4667.          (int)n3a->rdev.specdata2,
  4668.          (long long)n3a->fsid,
  4669.          (long long)n3a->fileid,
  4670. -        (long long)n3a->atime,
  4671. -        (long long)n3a->mtime,
  4672. -        (long long)n3a->ctime);
  4673. +        (long)n3a->atime.tv_sec, (unsigned long)n3a->atime.tv_nsec,
  4674. +        (long)n3a->mtime.tv_sec, (unsigned long)n3a->mtime.tv_nsec,
  4675. +        (long)n3a->ctime.tv_sec, (unsigned long)n3a->ctime.tv_nsec);
  4676.  
  4677.  out:
  4678.      return status;
  4679. diff --git a/tests/winfsinfo1/winfsinfo.c b/tests/winfsinfo1/winfsinfo.c
  4680. index 569dcd5..06cbc2e 100644
  4681. --- a/tests/winfsinfo1/winfsinfo.c
  4682. +++ b/tests/winfsinfo1/winfsinfo.c
  4683. @@ -741,7 +741,9 @@ bool get_nfs3attr(const char *progname, const char *filename)
  4684.          "\tsize=%lld\n\tused=%lld\n"
  4685.          "\trdev=( specdata1=0x%x specdata2=0x%x )\n"
  4686.          "\tfsid=0x%llx\n\tfileid=0x%llx\n"
  4687. -        "\tatime=%lld\n\tmtime=%lld\n\tctime=%lld\n"
  4688. +        "\tatime=(tv_sec=%ld,tv_nsec=%lu)\n"
  4689. +        "\tmtime=(tv_sec=%ld,tv_nsec=%lu)\n"
  4690. +        "\tctime=(tv_sec=%ld,tv_nsec=%lu)\n"
  4691.          ")\n",
  4692.          filename,
  4693.          (int)n3a->type,
  4694. @@ -755,9 +757,9 @@ bool get_nfs3attr(const char *progname, const char *filename)
  4695.          (int)n3a->rdev.specdata2,
  4696.          (unsigned long long)n3a->fsid,
  4697.          (unsigned long long)n3a->fileid,
  4698. -        (long long)n3a->atime,
  4699. -        (long long)n3a->mtime,
  4700. -        (long long)n3a->ctime);
  4701. +        (long)n3a->atime.tv_sec, (unsigned long)n3a->atime.tv_nsec,
  4702. +        (long)n3a->mtime.tv_sec, (unsigned long)n3a->mtime.tv_nsec,
  4703. +        (long)n3a->ctime.tv_sec, (unsigned long)n3a->ctime.tv_nsec);
  4704.      res = EXIT_SUCCESS;
  4705.  
  4706.  done:
  4707. --
  4708. 2.45.1
  4709.  
  4710. From 7e1c21df3355e8b06fb3527cffbb02f30c6b4256 Mon Sep 17 00:00:00 2001
  4711. From: Roland Mainz <roland.mainz@nrubsig.org>
  4712. Date: Tue, 21 Jan 2025 16:58:24 +0100
  4713. Subject: [PATCH 36/44] daemon,include,sys: Unsupported timestamps in
  4714.  |nfs3_attrs| EA should return |tv_sec==-1|
  4715.  
  4716. Unsupported timestamps in |nfs3_attrs| EA should return |tv_sec==-1|.
  4717.  
  4718. Reported-by: Lionel Cons <lionelcons1972@gmail.com>
  4719. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  4720. ---
  4721. daemon/fileinfoutil.c  |  1 +
  4722.  daemon/readdir.c       |  1 +
  4723.  daemon/util.h          |  8 --------
  4724.  include/nfs41_driver.h |  8 ++++++++
  4725.  sys/nfs41sys_ea.c      | 10 ++++++++++
  4726.  5 files changed, 20 insertions(+), 8 deletions(-)
  4727.  
  4728. diff --git a/daemon/fileinfoutil.c b/daemon/fileinfoutil.c
  4729. index 8278a90..bddbfd3 100644
  4730. --- a/daemon/fileinfoutil.c
  4731. +++ b/daemon/fileinfoutil.c
  4732. @@ -31,6 +31,7 @@
  4733.  #include "nfs41_daemon.h"
  4734.  #include "util.h"
  4735.  #include "nfs41_ops.h"
  4736. +#include "nfs41_driver.h" /* for |FILE_INFO_TIME_NOT_SET| */
  4737.  
  4738.  
  4739.  ULONG nfs_file_info_to_attributes(
  4740. diff --git a/daemon/readdir.c b/daemon/readdir.c
  4741. index 39b50fb..70cbbed 100644
  4742. --- a/daemon/readdir.c
  4743. +++ b/daemon/readdir.c
  4744. @@ -25,6 +25,7 @@
  4745.  #include <stdlib.h>
  4746.  #include <stdbool.h>
  4747.  #include <string.h>
  4748. +#include "nfs41_driver.h" /* for |FILE_INFO_TIME_NOT_SET| */
  4749.  #include "from_kernel.h"
  4750.  #include "nfs41_ops.h"
  4751.  #include "daemon_debug.h"
  4752. diff --git a/daemon/util.h b/daemon/util.h
  4753. index 8460c2a..b536f48 100644
  4754. --- a/daemon/util.h
  4755. +++ b/daemon/util.h
  4756. @@ -49,14 +49,6 @@ enum stable_how4;
  4757.      (((signed long long)(t1))-((signed long long)(t2)))
  4758.  typedef ULONGLONG util_reltimestamp;
  4759.  
  4760. -/*
  4761. - * LargeInteger.QuadPart value to indicate a time value was not
  4762. - * available
  4763. - *
  4764. - * gisburn: FIXME: We need a better header for this
  4765. - */
  4766. -#define FILE_INFO_TIME_NOT_SET (0LL)
  4767. -
  4768.  #define PTR2PTRDIFF_T(p) ((ptrdiff_t)((char *)((void *)(p)) - ((char *)0)))
  4769.  #define PTRDIFF_T2PTR(d) ((void *)(((char *)0) + (d)))
  4770.  
  4771. diff --git a/include/nfs41_driver.h b/include/nfs41_driver.h
  4772. index 7d933f0..0d9b8b3 100644
  4773. --- a/include/nfs41_driver.h
  4774. +++ b/include/nfs41_driver.h
  4775. @@ -107,6 +107,14 @@ typedef enum _nfs41_start_driver_state {
  4776.  
  4777.  #define NFS_VERSION_AUTONEGOTIATION (0xFFFF)
  4778.  
  4779. +/*
  4780. + * LargeInteger.QuadPart value to indicate a time value was not
  4781. + * available
  4782. + *
  4783. + * gisburn: FIXME: We need a better header for this
  4784. + */
  4785. +#define FILE_INFO_TIME_NOT_SET (0LL)
  4786. +
  4787.  /*
  4788.   * Error/Status codes
  4789.   */
  4790. diff --git a/sys/nfs41sys_ea.c b/sys/nfs41sys_ea.c
  4791. index 51e1bf0..dc14598 100644
  4792. --- a/sys/nfs41sys_ea.c
  4793. +++ b/sys/nfs41sys_ea.c
  4794. @@ -189,6 +189,16 @@ static void file_time_to_nfs_time(
  4795.      IN const PLARGE_INTEGER file_time,
  4796.      OUT nfs3_attrs_timestruc_t *nfs_time)
  4797.  {
  4798. +    if (file_time->QuadPart == FILE_INFO_TIME_NOT_SET) {
  4799. +        /*
  4800. +         * Return tv_sec==-1 to indicate that this
  4801. +         * value is not supported
  4802. +         */
  4803. +        nfs_time->tv_sec = -1L;
  4804. +        nfs_time->tv_nsec = ~0UL;
  4805. +        return;
  4806. +    }
  4807. +
  4808.      /*
  4809.       * Win32 timestamps (|time_file|) use 100-nanosecond intervals
  4810.       * (10000000 intervals == one second) since January 1, 1601 (UTC),
  4811. --
  4812. 2.45.1
  4813.  
  4814. From ac6ea385d9912623fb95d36cf3febbc670bec959 Mon Sep 17 00:00:00 2001
  4815. From: Roland Mainz <roland.mainz@nrubsig.org>
  4816. Date: Tue, 21 Jan 2025 17:26:05 +0100
  4817. Subject: [PATCH 37/44] sys: |nfs3_attrs|'s |mtime|+|ctime| uses wrong values
  4818.  
  4819. |nfs3_attrs| |mtime|+|ctime| uses wrong values.
  4820.  
  4821. Per Cygwin source code the mapping should be:
  4822. |FILE_BASIC_INFO.LastWriteTime|  <---> |nfs3_attrs.mtime|
  4823. |FILE_BASIC_INFO.ChangeTime|     <---> |nfs3_attrs.ctime|
  4824. |FILE_BASIC_INFO.LastAccessTime| <---> |nfs3_attrs.atime|
  4825.  
  4826. Reported-by: Lionel Cons <lionelcons1972@gmail.com>
  4827. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  4828. ---
  4829. sys/nfs41sys_ea.c | 4 ++--
  4830.  1 file changed, 2 insertions(+), 2 deletions(-)
  4831.  
  4832. diff --git a/sys/nfs41sys_ea.c b/sys/nfs41sys_ea.c
  4833. index dc14598..629f3d8 100644
  4834. --- a/sys/nfs41sys_ea.c
  4835. +++ b/sys/nfs41sys_ea.c
  4836. @@ -243,8 +243,8 @@ static void create_nfs3_attrs(
  4837.      attrs->fsid = nfs41_fcb->fsid_major ^ nfs41_fcb->fsid_minor;
  4838.      attrs->fileid = nfs41_fcb->fileid;
  4839.      file_time_to_nfs_time(&nfs41_fcb->BasicInfo.LastAccessTime, &attrs->atime);
  4840. -    file_time_to_nfs_time(&nfs41_fcb->BasicInfo.ChangeTime, &attrs->mtime);
  4841. -    file_time_to_nfs_time(&nfs41_fcb->BasicInfo.CreationTime, &attrs->ctime);
  4842. +    file_time_to_nfs_time(&nfs41_fcb->BasicInfo.LastWriteTime, &attrs->mtime);
  4843. +    file_time_to_nfs_time(&nfs41_fcb->BasicInfo.ChangeTime, &attrs->ctime);
  4844.  }
  4845.  
  4846.  
  4847. --
  4848. 2.45.1
  4849.  
  4850. From 6c1de151174b6a9b843341756b1b200a94d26fb3 Mon Sep 17 00:00:00 2001
  4851. From: Roland Mainz <roland.mainz@nrubsig.org>
  4852. Date: Wed, 22 Jan 2025 11:43:36 +0100
  4853. Subject: [PATCH 38/44] daemon: Cleanup |nfs41_file_info|
  4854.  
  4855. Cleanup |nfs41_file_info|.
  4856.  
  4857. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  4858. ---
  4859. daemon/nfs41_types.h | 36 ++++++++++++++++++++----------------
  4860.  1 file changed, 20 insertions(+), 16 deletions(-)
  4861.  
  4862. diff --git a/daemon/nfs41_types.h b/daemon/nfs41_types.h
  4863. index 93375db..8472f04 100644
  4864. --- a/daemon/nfs41_types.h
  4865. +++ b/daemon/nfs41_types.h
  4866. @@ -198,44 +198,48 @@ typedef struct __mdsthreshold4 {
  4867.  } mdsthreshold4;
  4868.  
  4869.  typedef struct __nfs41_file_info {
  4870. +    bitmap4                 attrmask;
  4871. +    uint64_t                fileid;
  4872.      nfs41_fsid              fsid;
  4873.      mdsthreshold4           mdsthreshold;
  4874.      nfstime4                time_access;
  4875.      nfstime4                time_create;
  4876.      nfstime4                time_modify;
  4877.      nfsacl41                *acl;
  4878. -    nfstime4                *time_delta; /* XXX: per-fs */
  4879. -    bitmap4                 attrmask;
  4880. -    bitmap4                 *supported_attrs; /* XXX: per-fs */
  4881. -    bitmap4                 *suppattr_exclcreat; /* XXX: per-fs */
  4882. -    uint64_t                maxread; /* XXX: per-fs */
  4883. -    uint64_t                maxwrite; /* XXX: per-fs */
  4884.      uint64_t                change;
  4885.      uint64_t                size;
  4886. -    uint64_t                fileid;
  4887. -    uint64_t                space_avail; /* XXX: per-fs */
  4888. -    uint64_t                space_free; /* XXX: per-fs */
  4889. -    uint64_t                space_total; /* XXX: per-fs */
  4890.      uint32_t                type;
  4891.      uint32_t                numlinks;
  4892.      uint32_t                rdattr_error;
  4893.      uint32_t                mode;
  4894.      uint32_t                mode_mask;
  4895. -    fs_locations4           *fs_locations; /* XXX: per-fs */
  4896. -    uint32_t                lease_time; /* XXX: per-server */
  4897. -    uint32_t                fs_layout_types; /* pnfs, XXX: per-fs */
  4898. +    char                    *owner;
  4899. +    char                    *owner_group;
  4900.      bool_t                  hidden;
  4901.      bool_t                  system;
  4902.      bool_t                  archive;
  4903. -    bool_t                  cansettime; /* XXX: per-fs */
  4904.      bool_t                  case_insensitive;
  4905.      bool_t                  case_preserving;
  4906.      bool_t                  symlink_dir;
  4907.      bool_t                  symlink_support;
  4908.      bool_t                  link_support;
  4909. -    char                    *owner;
  4910. -    char                    *owner_group;
  4911. +
  4912. +    /* per-fs attributes */
  4913.      uint32_t                aclsupport;
  4914. +    uint64_t                space_avail;
  4915. +    uint64_t                space_free;
  4916. +    uint64_t                space_total;
  4917. +    nfstime4                *time_delta;
  4918. +    bitmap4                 *supported_attrs;
  4919. +    bitmap4                 *suppattr_exclcreat;
  4920. +    uint64_t                maxread;
  4921. +    uint64_t                maxwrite;
  4922. +    fs_locations4           *fs_locations;
  4923. +    bool_t                  cansettime;
  4924. +    uint32_t                fs_layout_types; /* pnfs, per-fs */
  4925. +
  4926. +    /* per-server attributes */
  4927. +    uint32_t                lease_time;
  4928.  
  4929.      /* Buffers */
  4930.      char owner_buf[NFS4_FATTR4_OWNER_LIMIT+1];
  4931. --
  4932. 2.45.1
  4933.  
  4934. From 230fd28b25221e0c754c3bd83b9a79bc009b37d6 Mon Sep 17 00:00:00 2001
  4935. From: Roland Mainz <roland.mainz@nrubsig.org>
  4936. Date: Wed, 22 Jan 2025 11:45:07 +0100
  4937. Subject: [PATCH 39/44] daemon: name cache should only return values which were
  4938.  really set
  4939.  
  4940. name cache should only return values which were really set via
  4941. storing the information which fields are valid in a flags field,
  4942. and not rely on "magic values".
  4943.  
  4944. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  4945. ---
  4946. daemon/name_cache.c | 156 +++++++++++++++++++++++++++++++-------------
  4947.  1 file changed, 110 insertions(+), 46 deletions(-)
  4948.  
  4949. diff --git a/daemon/name_cache.c b/daemon/name_cache.c
  4950. index d2b46af..1faaa14 100644
  4951. --- a/daemon/name_cache.c
  4952. +++ b/daemon/name_cache.c
  4953. @@ -75,10 +75,26 @@ static __inline bool_t is_delegation(
  4954.      return type == OPEN_DELEGATE_READ || type == OPEN_DELEGATE_WRITE;
  4955.  }
  4956.  
  4957. +#define NC_ATTR_TYPE        (1 <<  0)
  4958. +#define NC_ATTR_CHANGE      (1 <<  1)
  4959. +#define NC_ATTR_FSID        (1 <<  2)
  4960. +#define NC_ATTR_SIZE        (1 <<  3)
  4961. +#define NC_ATTR_HIDDEN      (1 <<  4)
  4962. +#define NC_ATTR_ARCHIVE     (1 <<  5)
  4963. +#define NC_ATTR_MODE        (1 <<  6)
  4964. +#define NC_ATTR_NUMLINKS    (1 <<  7)
  4965. +#define NC_ATTR_OWNER       (1 <<  8)
  4966. +#define NC_ATTR_OWNER_GROUP (1 <<  9)
  4967. +#define NC_ATTR_TIME_ACCESS (1 << 10)
  4968. +#define NC_ATTR_TIME_CREATE (1 << 11)
  4969. +#define NC_ATTR_TIME_MODIFY (1 << 12)
  4970. +#define NC_ATTR_SYSTEM      (1 << 13)
  4971. +
  4972.  /* attribute cache */
  4973.  struct attr_cache_entry {
  4974.      RB_ENTRY(attr_cache_entry) rbnode;
  4975.      struct list_entry       free_entry;
  4976. +    uint32_t                nc_attrs;
  4977.      uint64_t                change;
  4978.      uint64_t                size;
  4979.      uint64_t                fileid;
  4980. @@ -139,6 +155,7 @@ static int attr_cache_entry_create(
  4981.      entry = attr_entry(cache->free_entries.next);
  4982.      list_remove(&entry->free_entry);
  4983.  
  4984. +    entry->nc_attrs = 0;
  4985.      entry->fileid = fileid;
  4986.      entry->invalidated = FALSE;
  4987.      entry->delegated = FALSE;
  4988. @@ -289,52 +306,73 @@ static void attr_cache_update(
  4989.  {
  4990.      /* update the attributes present in mask */
  4991.      if (info->attrmask.count > 0) {
  4992. -        if (info->attrmask.arr[0] & FATTR4_WORD0_TYPE)
  4993. +        if (info->attrmask.arr[0] & FATTR4_WORD0_TYPE) {
  4994. +            entry->nc_attrs |= NC_ATTR_TYPE;
  4995.              entry->type = (unsigned char)(info->type & NFS_FTYPE_MASK);
  4996. +        }
  4997.          if (info->attrmask.arr[0] & FATTR4_WORD0_CHANGE) {
  4998. +            entry->nc_attrs |= NC_ATTR_CHANGE;
  4999.              entry->change = info->change;
  5000.              /* revalidate whenever we get a change attribute */
  5001.              entry->invalidated = 0;
  5002.              entry->expiration = UTIL_GETRELTIME() + NAME_CACHE_EXPIRATION;
  5003.          }
  5004.          if (info->attrmask.arr[0] & FATTR4_WORD0_FSID) {
  5005. +            entry->nc_attrs |= NC_ATTR_FSID;
  5006.              entry->fsid_major = info->fsid.major;
  5007.              entry->fsid_minor = info->fsid.minor;
  5008.          }
  5009. -        if (info->attrmask.arr[0] & FATTR4_WORD0_SIZE)
  5010. +        if (info->attrmask.arr[0] & FATTR4_WORD0_SIZE) {
  5011. +            entry->nc_attrs |= NC_ATTR_SIZE;
  5012.              entry->size = info->size;
  5013. -        if (info->attrmask.arr[0] & FATTR4_WORD0_HIDDEN)
  5014. +        }
  5015. +        if (info->attrmask.arr[0] & FATTR4_WORD0_HIDDEN) {
  5016. +            entry->nc_attrs |= NC_ATTR_HIDDEN;
  5017.              entry->hidden = info->hidden;
  5018. -        if (info->attrmask.arr[0] & FATTR4_WORD0_ARCHIVE)
  5019. +        }
  5020. +        if (info->attrmask.arr[0] & FATTR4_WORD0_ARCHIVE) {
  5021. +            entry->nc_attrs |= NC_ATTR_ARCHIVE;
  5022.              entry->archive = info->archive;
  5023. +        }
  5024.      }
  5025.      if (info->attrmask.count > 1) {
  5026. -        if (info->attrmask.arr[1] & FATTR4_WORD1_MODE)
  5027. +        if (info->attrmask.arr[1] & FATTR4_WORD1_MODE) {
  5028. +            entry->nc_attrs |= NC_ATTR_MODE;
  5029.              entry->mode = info->mode;
  5030. +        }
  5031.          if (info->attrmask.arr[1] & FATTR4_WORD1_OWNER) {
  5032. +            entry->nc_attrs |= NC_ATTR_OWNER;
  5033.              EASSERT(info->owner != NULL);
  5034.              (void)strcpy(entry->owner, info->owner);
  5035.          }
  5036.          if (info->attrmask.arr[1] & FATTR4_WORD1_OWNER_GROUP) {
  5037. +            entry->nc_attrs |= NC_ATTR_OWNER_GROUP;
  5038.              EASSERT(info->owner_group != NULL);
  5039.              (void)strcpy(entry->owner_group, info->owner_group);
  5040.          }
  5041. -        if (info->attrmask.arr[1] & FATTR4_WORD1_NUMLINKS)
  5042. +        if (info->attrmask.arr[1] & FATTR4_WORD1_NUMLINKS) {
  5043. +            entry->nc_attrs |= NC_ATTR_NUMLINKS;
  5044.              entry->numlinks = info->numlinks;
  5045. +        }
  5046.          if (info->attrmask.arr[1] & FATTR4_WORD1_TIME_ACCESS) {
  5047. -            entry->time_access_s = info->time_access.seconds;
  5048. +            entry->nc_attrs |= NC_ATTR_TIME_ACCESS;
  5049. +            entry->time_access_s  = info->time_access.seconds;
  5050.              entry->time_access_ns = info->time_access.nseconds;
  5051.          }
  5052.          if (info->attrmask.arr[1] & FATTR4_WORD1_TIME_CREATE) {
  5053. -            entry->time_create_s = info->time_create.seconds;
  5054. +            entry->nc_attrs |= NC_ATTR_TIME_CREATE;
  5055. +            entry->time_create_s  = info->time_create.seconds;
  5056.              entry->time_create_ns = info->time_create.nseconds;
  5057.          }
  5058.          if (info->attrmask.arr[1] & FATTR4_WORD1_TIME_MODIFY) {
  5059. -            entry->time_modify_s = info->time_modify.seconds;
  5060. +            entry->nc_attrs |= NC_ATTR_TIME_MODIFY;
  5061. +            entry->time_modify_s  = info->time_modify.seconds;
  5062.              entry->time_modify_ns = info->time_modify.nseconds;
  5063.          }
  5064. -        if (info->attrmask.arr[1] & FATTR4_WORD1_SYSTEM)
  5065. +        if (info->attrmask.arr[1] & FATTR4_WORD1_SYSTEM) {
  5066. +            entry->nc_attrs |= NC_ATTR_SYSTEM;
  5067.              entry->system = info->system;
  5068. +        }
  5069.      }
  5070.  
  5071.      if (is_delegation(delegation))
  5072. @@ -345,36 +383,49 @@ static void copy_attrs(
  5073.      OUT nfs41_file_info *dst,
  5074.      IN const struct attr_cache_entry *src)
  5075.  {
  5076. -    dst->attrmask.count = 2;
  5077. -    dst->attrmask.arr[0] = FATTR4_WORD0_TYPE | FATTR4_WORD0_CHANGE
  5078. -        | FATTR4_WORD0_SIZE | FATTR4_WORD0_FSID | FATTR4_WORD0_FILEID
  5079. -        | FATTR4_WORD0_HIDDEN | FATTR4_WORD0_ARCHIVE;
  5080. -    dst->attrmask.arr[1] = FATTR4_WORD1_MODE
  5081. -        | FATTR4_WORD1_NUMLINKS
  5082. -        | FATTR4_WORD1_SYSTEM;
  5083. -
  5084. -    dst->change = src->change;
  5085. -    dst->size = src->size;
  5086. -    if (!((src->time_access_s == 0) && (src->time_access_ns == 0))) {
  5087. +    dst->attrmask.arr[0] = 0;
  5088. +    dst->attrmask.arr[1] = 0;
  5089. +
  5090. +    dst->attrmask.arr[0] |= FATTR4_WORD0_FILEID;
  5091. +    dst->fileid = src->fileid;
  5092. +
  5093. +    if (src->nc_attrs & NC_ATTR_CHANGE) {
  5094. +        dst->attrmask.arr[0] |= FATTR4_WORD0_CHANGE;
  5095. +        dst->change = src->change;
  5096. +    }
  5097. +    if (src->nc_attrs & NC_ATTR_SIZE) {
  5098. +        dst->attrmask.arr[0] |= FATTR4_WORD0_SIZE;
  5099. +        dst->size = src->size;
  5100. +    }
  5101. +    if (src->nc_attrs & NC_ATTR_TIME_ACCESS) {
  5102.          dst->attrmask.arr[1] |= FATTR4_WORD1_TIME_ACCESS;
  5103. -    dst->time_access.seconds = src->time_access_s;
  5104. -    dst->time_access.nseconds = src->time_access_ns;
  5105. +        dst->time_access.seconds = src->time_access_s;
  5106. +        dst->time_access.nseconds = src->time_access_ns;
  5107.      }
  5108. -    if (!((src->time_create_s == 0) && (src->time_create_ns == 0))) {
  5109. +    if (src->nc_attrs & NC_ATTR_TIME_CREATE) {
  5110.          dst->attrmask.arr[1] |= FATTR4_WORD1_TIME_CREATE;
  5111. -    dst->time_create.seconds = src->time_create_s;
  5112. -    dst->time_create.nseconds = src->time_create_ns;
  5113. +        dst->time_create.seconds = src->time_create_s;
  5114. +        dst->time_create.nseconds = src->time_create_ns;
  5115.      }
  5116. -    if (!((src->time_modify_s == 0) && (src->time_modify_ns == 0))) {
  5117. +    if (src->nc_attrs & NC_ATTR_TIME_MODIFY) {
  5118.          dst->attrmask.arr[1] |= FATTR4_WORD1_TIME_MODIFY;
  5119. -    dst->time_modify.seconds = src->time_modify_s;
  5120. -    dst->time_modify.nseconds = src->time_modify_ns;
  5121. +        dst->time_modify.seconds = src->time_modify_s;
  5122. +        dst->time_modify.nseconds = src->time_modify_ns;
  5123.      }
  5124. -    dst->type = src->type;
  5125. -    dst->numlinks = src->numlinks;
  5126. -    dst->mode = src->mode;
  5127. -
  5128. -    if (src->owner[0] != '\0') {
  5129. +    if (src->nc_attrs & NC_ATTR_TYPE) {
  5130. +        dst->attrmask.arr[0] |= FATTR4_WORD0_TYPE;
  5131. +        dst->type = src->type;
  5132. +    }
  5133. +    if (src->nc_attrs & NC_ATTR_NUMLINKS) {
  5134. +        dst->attrmask.arr[1] |= FATTR4_WORD1_NUMLINKS;
  5135. +        dst->numlinks = src->numlinks;
  5136. +    }
  5137. +    if (src->nc_attrs & NC_ATTR_MODE) {
  5138. +        dst->attrmask.arr[1] |= FATTR4_WORD1_MODE;
  5139. +        dst->mode = src->mode;
  5140. +    }
  5141. +    if (src->nc_attrs & NC_ATTR_OWNER) {
  5142. +        dst->attrmask.arr[1] |= FATTR4_WORD1_OWNER;
  5143.          dst->owner = dst->owner_buf;
  5144.          (void)strcpy(dst->owner, src->owner);
  5145.      }
  5146. @@ -382,8 +433,8 @@ static void copy_attrs(
  5147.          /* this should only happen for newly created files/dirs */
  5148.          dst->owner = NULL;
  5149.      }
  5150. -
  5151. -    if (src->owner_group[0] != '\0') {
  5152. +    if (src->nc_attrs & NC_ATTR_OWNER_GROUP) {
  5153. +        dst->attrmask.arr[1] |= FATTR4_WORD1_OWNER_GROUP;
  5154.          dst->owner_group = dst->owner_group_buf;
  5155.          (void)strcpy(dst->owner_group, src->owner_group);
  5156.      }
  5157. @@ -391,17 +442,30 @@ static void copy_attrs(
  5158.          /* this should only happen for newly created files/dirs */
  5159.          dst->owner_group = NULL;
  5160.      }
  5161. -    dst->fileid = src->fileid;
  5162. -    dst->fsid.major = src->fsid_major;
  5163. -    dst->fsid.minor = src->fsid_minor;
  5164. -    dst->hidden = src->hidden;
  5165. -    dst->system = src->system;
  5166. -    dst->archive = src->archive;
  5167. +    if (src->nc_attrs & NC_ATTR_FSID) {
  5168. +        dst->attrmask.arr[0] |= FATTR4_WORD0_FSID;
  5169. +        dst->fsid.major = src->fsid_major;
  5170. +        dst->fsid.minor = src->fsid_minor;
  5171. +    }
  5172. +    if (src->nc_attrs & NC_ATTR_HIDDEN) {
  5173. +        dst->attrmask.arr[0] |= FATTR4_WORD0_HIDDEN;
  5174. +        dst->hidden = src->hidden;
  5175. +    }
  5176. +    if (src->nc_attrs & NC_ATTR_ARCHIVE) {
  5177. +        dst->attrmask.arr[0] |= FATTR4_WORD0_ARCHIVE;
  5178. +        dst->archive = src->archive;
  5179. +    }
  5180. +    if (src->nc_attrs & NC_ATTR_SYSTEM) {
  5181. +        dst->attrmask.arr[1] |= FATTR4_WORD1_SYSTEM;
  5182. +        dst->system = src->system;
  5183. +    }
  5184.  
  5185. -    if (dst->owner)
  5186. -        dst->attrmask.arr[1] |= FATTR4_WORD1_OWNER;
  5187. -    if (dst->owner_group)
  5188. -        dst->attrmask.arr[1] |= FATTR4_WORD1_OWNER_GROUP;
  5189. +    if (dst->attrmask.arr[1] != 0) {
  5190. +        dst->attrmask.count = 2;
  5191. +    }
  5192. +    else {
  5193. +        dst->attrmask.count = 1;
  5194. +    }
  5195.  }
  5196.  
  5197.  
  5198. --
  5199. 2.45.1
  5200.  
  5201. From ddfbbc8c53076df23dc642ce92a179d7de3d08f7 Mon Sep 17 00:00:00 2001
  5202. From: Roland Mainz <roland.mainz@nrubsig.org>
  5203. Date: Wed, 22 Jan 2025 11:48:51 +0100
  5204. Subject: [PATCH 40/44] cygwin: Update drmemory flags for better test coverage
  5205.  and performance
  5206.  
  5207. Update drmemory flags for better test coverage and performance.
  5208.  
  5209. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  5210. ---
  5211. cygwin/devel/msnfs41client.bash | 6 ++++++
  5212.  1 file changed, 6 insertions(+)
  5213.  
  5214. diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash
  5215. index 4699afb..92171fd 100755
  5216. --- a/cygwin/devel/msnfs41client.bash
  5217. +++ b/cygwin/devel/msnfs41client.bash
  5218. @@ -465,12 +465,15 @@ function nfsclient_rundeamon
  5219.                                 '-delay_frees_maxsz' $((64*1024*1024))
  5220.                                 '-redzone_size' '4096'
  5221.                                 '-check_uninitialized'
  5222. +                               '-check_uninit_non_moves'
  5223.                                 '-check_uninit_all'
  5224.                                 '-strict_bitops'
  5225.                                 '-gen_suppress_syms'
  5226.                                 '-preload_symbols'
  5227.                                 # no symbol cache, user "SYSTEM" cannot write data to cache
  5228.                                 '-no_use_symcache'
  5229. +                               # disable leak checking for performance
  5230. +                               '-no_check_leaks'
  5231.                                 '--'
  5232.                                 "$(cygpath -w "$(which "${nfsd_args[0]}")")"
  5233.                                 "${nfsd_args[@]:1}"
  5234. @@ -597,12 +600,15 @@ function nfsclient_system_rundeamon
  5235.                                 '-delay_frees_maxsz' $((64*1024*1024))
  5236.                                 '-redzone_size' '4096'
  5237.                                 '-check_uninitialized'
  5238. +                               '-check_uninit_non_moves'
  5239.                                 '-check_uninit_all'
  5240.                                 '-strict_bitops'
  5241.                                 '-gen_suppress_syms'
  5242.                                 '-preload_symbols'
  5243.                                 # no symbol cache, user "SYSTEM" cannot write data to cache
  5244.                                 '-no_use_symcache'
  5245. +                               # disable leak checking for performance
  5246. +                               '-no_check_leaks'
  5247.                                 '--'
  5248.                                 "$(cygpath -w "$(which "${nfsd_args[0]}")")"
  5249.                                 "${nfsd_args[@]:1}"
  5250. --
  5251. 2.45.1
  5252.  
  5253. From c79eb1992013052f352a0bb9f5b5cb3c71853f14 Mon Sep 17 00:00:00 2001
  5254. From: Roland Mainz <roland.mainz@nrubsig.org>
  5255. Date: Wed, 22 Jan 2025 12:30:23 +0100
  5256. Subject: [PATCH 41/44] daemon: |bitmap_isset()| should return |true|/|false|
  5257.  
  5258. |bitmap_isset()| should return |true|/|false|, and not
  5259. an integer value based on |mask->arr[word] & flag| or |0|.
  5260.  
  5261. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  5262. ---
  5263. daemon/util.h | 4 ++--
  5264.  1 file changed, 2 insertions(+), 2 deletions(-)
  5265.  
  5266. diff --git a/daemon/util.h b/daemon/util.h
  5267. index b536f48..829cbba 100644
  5268. --- a/daemon/util.h
  5269. +++ b/daemon/util.h
  5270. @@ -76,12 +76,12 @@ bool_t verify_commit(
  5271.      IN nfs41_write_verf *verf);
  5272.  
  5273.  /* bitmap4 */
  5274. -static __inline bool_t bitmap_isset(
  5275. +static __inline bool bitmap_isset(
  5276.      IN const bitmap4 *mask,
  5277.      IN uint32_t word,
  5278.      IN uint32_t flag)
  5279.  {
  5280. -    return mask->count > word && mask->arr[word] & flag;
  5281. +    return ((mask->count > word) && (mask->arr[word] & flag))?true:false;
  5282.  }
  5283.  static __inline void bitmap_set(
  5284.      IN bitmap4 *mask,
  5285. --
  5286. 2.45.1
  5287.  
  5288. From 1ee25090cee142291e3b1c874f844f5d1d93e931 Mon Sep 17 00:00:00 2001
  5289. From: Roland Mainz <roland.mainz@nrubsig.org>
  5290. Date: Wed, 22 Jan 2025 12:36:08 +0100
  5291. Subject: [PATCH 42/44] daemon: |bitmap_*()| functions should use |restrict|
  5292.  
  5293. |bitmap_*()| functions should use |restrict|
  5294.  
  5295. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  5296. ---
  5297. daemon/util.h | 10 +++++-----
  5298.  1 file changed, 5 insertions(+), 5 deletions(-)
  5299.  
  5300. diff --git a/daemon/util.h b/daemon/util.h
  5301. index 829cbba..1e73110 100644
  5302. --- a/daemon/util.h
  5303. +++ b/daemon/util.h
  5304. @@ -77,14 +77,14 @@ bool_t verify_commit(
  5305.  
  5306.  /* bitmap4 */
  5307.  static __inline bool bitmap_isset(
  5308. -    IN const bitmap4 *mask,
  5309. +    IN const bitmap4 *restrict mask,
  5310.      IN uint32_t word,
  5311.      IN uint32_t flag)
  5312.  {
  5313.      return ((mask->count > word) && (mask->arr[word] & flag))?true:false;
  5314.  }
  5315.  static __inline void bitmap_set(
  5316. -    IN bitmap4 *mask,
  5317. +    IN bitmap4 *restrict mask,
  5318.      IN uint32_t word,
  5319.      IN uint32_t flag)
  5320.  {
  5321. @@ -96,7 +96,7 @@ static __inline void bitmap_set(
  5322.      }
  5323.  }
  5324.  static __inline void bitmap_unset(
  5325. -    IN bitmap4 *mask,
  5326. +    IN bitmap4 *restrict mask,
  5327.      IN uint32_t word,
  5328.      IN uint32_t flag)
  5329.  {
  5330. @@ -107,8 +107,8 @@ static __inline void bitmap_unset(
  5331.      }
  5332.  }
  5333.  static __inline void bitmap_intersect(
  5334. -    IN bitmap4 *dst,
  5335. -    IN const bitmap4 *src)
  5336. +    IN bitmap4 *restrict dst,
  5337. +    IN const bitmap4 *restrict src)
  5338.  {
  5339.      uint32_t i, count = 0;
  5340.      for (i = 0; i < 3; i++) {
  5341. --
  5342. 2.45.1
  5343.  
  5344. From 6bb3cdf7c6b43ed775bb488acda79690c1a3c6d4 Mon Sep 17 00:00:00 2001
  5345. From: Roland Mainz <roland.mainz@nrubsig.org>
  5346. Date: Wed, 22 Jan 2025 12:49:37 +0100
  5347. Subject: [PATCH 43/44] daemon: fileinfoutil&co should use |restrict|
  5348.  
  5349. fileinfoutil&co should use |restrict|
  5350.  
  5351. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  5352. ---
  5353. daemon/fileinfoutil.c | 32 ++++++++++++-------------
  5354.  daemon/util.h         | 56 +++++++++++++++++++++----------------------
  5355.  2 files changed, 44 insertions(+), 44 deletions(-)
  5356.  
  5357. diff --git a/daemon/fileinfoutil.c b/daemon/fileinfoutil.c
  5358. index bddbfd3..f86aa5a 100644
  5359. --- a/daemon/fileinfoutil.c
  5360. +++ b/daemon/fileinfoutil.c
  5361. @@ -35,7 +35,7 @@
  5362.  
  5363.  
  5364.  ULONG nfs_file_info_to_attributes(
  5365. -    IN const nfs41_file_info *info)
  5366. +    IN const nfs41_file_info *restrict info)
  5367.  {
  5368.      ULONG attrs = 0;
  5369.  
  5370. @@ -74,8 +74,8 @@ ULONG nfs_file_info_to_attributes(
  5371.  }
  5372.  
  5373.  void nfs_to_basic_info(
  5374. -    IN const char *name,
  5375. -    IN const nfs41_file_info *info,
  5376. +    IN const char *restrict name,
  5377. +    IN const nfs41_file_info *restrict info,
  5378.      OUT PFILE_BASIC_INFO basic_out)
  5379.  {
  5380.      EASSERT(info->attrmask.count > 0);
  5381. @@ -121,8 +121,8 @@ void nfs_to_basic_info(
  5382.  }
  5383.  
  5384.  void nfs_to_standard_info(
  5385. -    IN const nfs41_file_info *info,
  5386. -    OUT PFILE_STANDARD_INFO std_out)
  5387. +    IN const nfs41_file_info *restrict info,
  5388. +    OUT PFILE_STANDARD_INFO restrict std_out)
  5389.  {
  5390.      const ULONG FileAttributes = nfs_file_info_to_attributes(info);
  5391.  
  5392. @@ -139,9 +139,9 @@ void nfs_to_standard_info(
  5393.  }
  5394.  
  5395.  void nfs_to_network_openinfo(
  5396. -    IN const char *name,
  5397. -    IN const nfs41_file_info *info,
  5398. -    OUT PFILE_NETWORK_OPEN_INFORMATION net_out)
  5399. +    IN const char *restrict name,
  5400. +    IN const nfs41_file_info *restrict info,
  5401. +    OUT PFILE_NETWORK_OPEN_INFORMATION restrict net_out)
  5402.  {
  5403.      EASSERT(info->attrmask.count > 0);
  5404.  
  5405. @@ -189,9 +189,9 @@ void nfs_to_network_openinfo(
  5406.  
  5407.  #ifdef NFS41_DRIVER_WSL_SUPPORT
  5408.  void nfs_to_stat_info(
  5409. -    IN const char *name,
  5410. -    IN const nfs41_file_info *info,
  5411. -    OUT PFILE_STAT_INFORMATION stat_out)
  5412. +    IN const char *restrict name,
  5413. +    IN const nfs41_file_info *restrict info,
  5414. +    OUT PFILE_STAT_INFORMATION restrict stat_out)
  5415.  {
  5416.      EASSERT(info->attrmask.count > 0);
  5417.  
  5418. @@ -249,9 +249,9 @@ void nfs_to_stat_info(
  5419.  
  5420.  void nfs_to_stat_lx_info(
  5421.      IN void *daemon_context,
  5422. -    IN const char *name,
  5423. -    IN const nfs41_file_info *info,
  5424. -    OUT PFILE_STAT_LX_INFORMATION stat_lx_out)
  5425. +    IN const char *restrict name,
  5426. +    IN const nfs41_file_info *restrict info,
  5427. +    OUT PFILE_STAT_LX_INFORMATION restrict stat_lx_out)
  5428.  {
  5429.      nfs41_daemon_globals *nfs41_dg =
  5430.          (nfs41_daemon_globals *)daemon_context;
  5431. @@ -445,8 +445,8 @@ void nfs_to_stat_lx_info(
  5432.  
  5433.  /* copy |nfs41_file_info| */
  5434.  void nfs41_file_info_cpy(
  5435. -    OUT nfs41_file_info *dest,
  5436. -    IN const nfs41_file_info *src,
  5437. +    OUT nfs41_file_info *restrict dest,
  5438. +    IN const nfs41_file_info *restrict src,
  5439.      IN int flags)
  5440.  {
  5441.      const bitmap4 *attrmask = &src->attrmask;
  5442. diff --git a/daemon/util.h b/daemon/util.h
  5443. index 1e73110..c5bbb1b 100644
  5444. --- a/daemon/util.h
  5445. +++ b/daemon/util.h
  5446. @@ -174,35 +174,35 @@ static __inline void open_delegation4_cpy(
  5447.  }
  5448.  
  5449.  ULONG nfs_file_info_to_attributes(
  5450. -    IN const nfs41_file_info *info);
  5451. +    IN const nfs41_file_info *restrict info);
  5452.  void nfs_to_basic_info(
  5453. -    IN const char *name,
  5454. -    IN const nfs41_file_info *info,
  5455. -    OUT PFILE_BASIC_INFO basic_out);
  5456. +    IN const char *restrict name,
  5457. +    IN const nfs41_file_info *restrict info,
  5458. +    OUT PFILE_BASIC_INFO restrict basic_out);
  5459.  void nfs_to_standard_info(
  5460. -    IN const nfs41_file_info *info,
  5461. -    OUT PFILE_STANDARD_INFO std_out);
  5462. +    IN const nfs41_file_info *restrict info,
  5463. +    OUT PFILE_STANDARD_INFO restrict std_out);
  5464.  void nfs_to_network_openinfo(
  5465. -    IN const char *name,
  5466. -    IN const nfs41_file_info *info,
  5467. -    OUT PFILE_NETWORK_OPEN_INFORMATION std_out);
  5468. +    IN const char *restrict name,
  5469. +    IN const nfs41_file_info *restrict info,
  5470. +    OUT PFILE_NETWORK_OPEN_INFORMATION restrict std_out);
  5471.  #ifdef NFS41_DRIVER_WSL_SUPPORT
  5472.  void nfs_to_stat_info(
  5473. -    IN const char *name,
  5474. -    IN const nfs41_file_info *info,
  5475. -    OUT PFILE_STAT_INFORMATION stat_out);
  5476. +    IN const char *restrict name,
  5477. +    IN const nfs41_file_info *restrict info,
  5478. +    OUT PFILE_STAT_INFORMATION restrict stat_out);
  5479.  void nfs_to_stat_lx_info(
  5480.      IN void *daemon_context,
  5481. -    IN const char *name,
  5482. -    IN const nfs41_file_info *info,
  5483. -    OUT PFILE_STAT_LX_INFORMATION stat_lx_out);
  5484. +    IN const char *restrict name,
  5485. +    IN const nfs41_file_info *restrict info,
  5486. +    OUT PFILE_STAT_LX_INFORMATION restrict stat_lx_out);
  5487.  #endif /* NFS41_DRIVER_WSL_SUPPORT */
  5488.  
  5489.  /* Copy |info->symlink_dir| */
  5490.  #define NFS41FILEINFOCPY_COPY_SYMLINK_DIR (1 << 0)
  5491.  void nfs41_file_info_cpy(
  5492. -    OUT nfs41_file_info *dest,
  5493. -    IN const nfs41_file_info *src,
  5494. +    OUT nfs41_file_info *restrict dest,
  5495. +    IN const nfs41_file_info *restrict src,
  5496.      IN int flags);
  5497.  
  5498.  /* http://msdn.microsoft.com/en-us/library/ms724290%28VS.85%29.aspx:
  5499. @@ -212,8 +212,8 @@ void nfs41_file_info_cpy(
  5500.  #define FILETIME_EPOCH 116444736000000000LL
  5501.  
  5502.  static __inline void file_time_to_nfs_time(
  5503. -    IN const PLARGE_INTEGER file_time,
  5504. -    OUT nfstime4 *nfs_time)
  5505. +    IN const PLARGE_INTEGER restrict file_time,
  5506. +    OUT nfstime4 *restrict nfs_time)
  5507.  {
  5508.      LONGLONG diff = file_time->QuadPart - FILETIME_EPOCH;
  5509.      nfs_time->seconds = diff / 10000000;
  5510. @@ -221,8 +221,8 @@ static __inline void file_time_to_nfs_time(
  5511.  }
  5512.  
  5513.  static __inline void nfs_time_to_file_time(
  5514. -    IN const nfstime4 *nfs_time,
  5515. -    OUT PLARGE_INTEGER file_time)
  5516. +    IN const nfstime4 *restrict nfs_time,
  5517. +    OUT PLARGE_INTEGER restrict file_time)
  5518.  {
  5519.      file_time->QuadPart = FILETIME_EPOCH +
  5520.          nfs_time->seconds * 10000000 +
  5521. @@ -230,12 +230,12 @@ static __inline void nfs_time_to_file_time(
  5522.  }
  5523.  
  5524.  void get_file_time(
  5525. -    OUT PLARGE_INTEGER file_time);
  5526. +    OUT PLARGE_INTEGER restrict file_time);
  5527.  void get_nfs_time(
  5528. -    OUT nfstime4 *nfs_time);
  5529. +    OUT nfstime4 *restrict nfs_time);
  5530.  
  5531.  static __inline void nfstime_normalize(
  5532. -    IN OUT nfstime4 *nfstime)
  5533. +    IN OUT nfstime4 *restrict nfstime)
  5534.  {
  5535.      /* return time in normalized form (0 <= nsec < 1s) */
  5536.      while ((int32_t)nfstime->nseconds < 0) {
  5537. @@ -244,8 +244,8 @@ static __inline void nfstime_normalize(
  5538.      }
  5539.  }
  5540.  static __inline void nfstime_diff(
  5541. -    IN const nfstime4 *lhs,
  5542. -    IN const nfstime4 *rhs,
  5543. +    IN const nfstime4 *restrict lhs,
  5544. +    IN const nfstime4 *restrict rhs,
  5545.      OUT nfstime4 *result)
  5546.  {
  5547.      /* result = lhs - rhs */
  5548. @@ -254,8 +254,8 @@ static __inline void nfstime_diff(
  5549.      nfstime_normalize(result);
  5550.  }
  5551.  static __inline void nfstime_abs(
  5552. -    IN const nfstime4 *nt,
  5553. -    OUT nfstime4 *result)
  5554. +    IN const nfstime4 *restrict nt,
  5555. +    OUT nfstime4 *restrict result)
  5556.  {
  5557.      if (nt->seconds < 0) {
  5558.          const nfstime4 zero = { .seconds=0LL, .nseconds=0UL };
  5559. --
  5560. 2.45.1
  5561.  
  5562. From 1f92cdde986948d79320d5a22c031cebc273c2da Mon Sep 17 00:00:00 2001
  5563. From: Roland Mainz <roland.mainz@nrubsig.org>
  5564. Date: Mon, 27 Jan 2025 13:33:10 +0100
  5565. Subject: [PATCH 44/44] build.vc19,daemon: RFE: Implement NFSv4.2 READ_PLUS
  5566.  support (read sparse files)
  5567.  
  5568. RFE: Implement NFSv4.2 READ_PLUS support (read sparse files)
  5569.  
  5570. Reported-by: Lionel Cons <lionelcons1972@gmail.com>
  5571. Reported-by: Cedric Blancher <cedric.blancher@gmail.com>
  5572. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  5573. ---
  5574. build.vc19/nfsd/nfsd.vcxproj         |   2 +
  5575.  build.vc19/nfsd/nfsd.vcxproj.filters |   6 +
  5576.  daemon/namespace.c                   |  14 +-
  5577.  daemon/nfs41.h                       |   4 +-
  5578.  daemon/nfs41_ops.c                   |   4 +-
  5579.  daemon/nfs41_ops.h                   |  73 +++++++++-
  5580.  daemon/nfs41_xdr.c                   |  30 ++++-
  5581.  daemon/nfs41_xdr.h                   |  10 +-
  5582.  daemon/nfs42_ops.c                   |  96 ++++++++++++++
  5583.  daemon/nfs42_xdr.c                   | 192 +++++++++++++++++++++++++++
  5584.  daemon/readwrite.c                   |  18 ++-
  5585.  daemon/recovery.c                    |   6 +-
  5586.  12 files changed, 443 insertions(+), 12 deletions(-)
  5587.  create mode 100644 daemon/nfs42_ops.c
  5588.  create mode 100644 daemon/nfs42_xdr.c
  5589.  
  5590. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  5591. index ed5470a..1d9a09f 100644
  5592. --- a/build.vc19/nfsd/nfsd.vcxproj
  5593. +++ b/build.vc19/nfsd/nfsd.vcxproj
  5594. @@ -285,6 +285,8 @@
  5595.      <ClCompile Include="..\..\daemon\nfs41_session.c" />
  5596.      <ClCompile Include="..\..\daemon\nfs41_superblock.c" />
  5597.      <ClCompile Include="..\..\daemon\nfs41_xdr.c" />
  5598. +    <ClCompile Include="..\..\daemon\nfs42_ops.c" />
  5599. +    <ClCompile Include="..\..\daemon\nfs42_xdr.c" />
  5600.      <ClCompile Include="..\..\daemon\open.c" />
  5601.      <ClCompile Include="..\..\daemon\pnfs_debug.c" />
  5602.      <ClCompile Include="..\..\daemon\pnfs_device.c" />
  5603. diff --git a/build.vc19/nfsd/nfsd.vcxproj.filters b/build.vc19/nfsd/nfsd.vcxproj.filters
  5604. index ffc0e6e..5f6939f 100644
  5605. --- a/build.vc19/nfsd/nfsd.vcxproj.filters
  5606. +++ b/build.vc19/nfsd/nfsd.vcxproj.filters
  5607. @@ -90,6 +90,12 @@
  5608.      <ClCompile Include="..\..\daemon\nfs41_xdr.c">
  5609.        <Filter>Source Files</Filter>
  5610.      </ClCompile>
  5611. +    <ClCompile Include="..\..\daemon\nfs42_ops.c">
  5612. +      <Filter>Source Files</Filter>
  5613. +    </ClCompile>
  5614. +    <ClCompile Include="..\..\daemon\nfs42_xdr.c">
  5615. +      <Filter>Source Files</Filter>
  5616. +    </ClCompile>
  5617.      <ClCompile Include="..\..\daemon\open.c">
  5618.        <Filter>Source Files</Filter>
  5619.      </ClCompile>
  5620. diff --git a/daemon/namespace.c b/daemon/namespace.c
  5621. index 811e715..b30e0eb 100644
  5622. --- a/daemon/namespace.c
  5623. +++ b/daemon/namespace.c
  5624. @@ -1,5 +1,6 @@
  5625.  /* NFSv4.1 client for Windows
  5626. - * Copyright (C) 2012 The Regents of the University of Michigan
  5627. + * Copyright (C) 2012 The Regents of the University of Michigan
  5628. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  5629.   *
  5630.   * Olga Kornievskaia <aglo@umich.edu>
  5631.   * Casey Bodley <cbodley@umich.edu>
  5632. @@ -64,6 +65,11 @@ int nfs41_root_create(
  5633.  
  5634.      list_init(&root->clients);
  5635.      root->use_nfspubfh = use_nfspubfh;
  5636. +    /*
  5637. +     * nfs41_root_mount_addrs() will enable NFSv4.2 features (like
  5638. +     * |OP_READ_PLUS|) after NFSv4.x minor version autonegitiation
  5639. +     */
  5640. +    root->supports_nfs42_read_plus = false;
  5641.      if (nfsvers == NFS_VERSION_AUTONEGOTIATION) {
  5642.          /*
  5643.           * Use auto negotiation, |nfs41_root_mount_addrs()| will
  5644. @@ -433,6 +439,12 @@ retry_nfs41_exchange_id:
  5645.          goto out_free_rpc;
  5646.      }
  5647.  
  5648. +    /* Enable NFS features after NFSv4.x minor version negotiation */
  5649. +    if (root->nfsminorvers >= 2) {
  5650. +        DPRINTF(0, ("nfs41_root_mount_addrs: Enabling OP_READ_PLUS\n"));
  5651. +        root->supports_nfs42_read_plus = true;
  5652. +    }
  5653. +
  5654.      /* attempt to match existing clients by the exchangeid response */
  5655.      EnterCriticalSection(&root->lock);
  5656.      status = root_client_find(root, &exchangeid, is_data, &client);
  5657. diff --git a/daemon/nfs41.h b/daemon/nfs41.h
  5658. index e6e82ad..666c4ae 100644
  5659. --- a/daemon/nfs41.h
  5660. +++ b/daemon/nfs41.h
  5661. @@ -1,5 +1,6 @@
  5662.  /* NFSv4.1 client for Windows
  5663. - * Copyright (C) 2012 The Regents of the University of Michigan
  5664. + * Copyright (C) 2012 The Regents of the University of Michigan
  5665. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  5666.   *
  5667.   * Olga Kornievskaia <aglo@umich.edu>
  5668.   * Casey Bodley <cbodley@umich.edu>
  5669. @@ -300,6 +301,7 @@ typedef struct __nfs41_root {
  5670.      CRITICAL_SECTION lock;
  5671.      struct list_entry clients;
  5672.      bool use_nfspubfh;
  5673. +    bool supports_nfs42_read_plus;
  5674.      DWORD nfsminorvers;
  5675.      uint32_t wsize;
  5676.      uint32_t rsize;
  5677. diff --git a/daemon/nfs41_ops.c b/daemon/nfs41_ops.c
  5678. index a4e059d..a384175 100644
  5679. --- a/daemon/nfs41_ops.c
  5680. +++ b/daemon/nfs41_ops.c
  5681. @@ -1,5 +1,6 @@
  5682.  /* NFSv4.1 client for Windows
  5683. - * Copyright (C) 2012 The Regents of the University of Michigan
  5684. + * Copyright (C) 2012 The Regents of the University of Michigan
  5685. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  5686.   *
  5687.   * Olga Kornievskaia <aglo@umich.edu>
  5688.   * Casey Bodley <cbodley@umich.edu>
  5689. @@ -908,6 +909,7 @@ out:
  5690.      return status;
  5691.  }
  5692.  
  5693. +
  5694.  int nfs41_commit(
  5695.      IN nfs41_session *session,
  5696.      IN nfs41_path_fh *file,
  5697. diff --git a/daemon/nfs41_ops.h b/daemon/nfs41_ops.h
  5698. index 81bad50..2e2e49a 100644
  5699. --- a/daemon/nfs41_ops.h
  5700. +++ b/daemon/nfs41_ops.h
  5701. @@ -1,8 +1,10 @@
  5702.  /* NFSv4.1 client for Windows
  5703. - * Copyright (C) 2012 The Regents of the University of Michigan
  5704. + * Copyright (C) 2012 The Regents of the University of Michigan
  5705. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  5706.   *
  5707.   * Olga Kornievskaia <aglo@umich.edu>
  5708.   * Casey Bodley <cbodley@umich.edu>
  5709. + * Roland Mainz <roland.mainz@nrubsig.org>
  5710.   *
  5711.   * This library is free software; you can redistribute it and/or modify it
  5712.   * under the terms of the GNU Lesser General Public License as published by
  5713. @@ -726,6 +728,65 @@ typedef struct __nfs41_read_res {
  5714.      nfs41_read_res_ok       resok4;
  5715.  } nfs41_read_res;
  5716.  
  5717. +typedef struct __data4 {
  5718. +    uint64_t        offset;
  5719. +    uint32_t        count;
  5720. +    uint32_t        data_len;
  5721. +    unsigned char   *data;
  5722. +} data4;
  5723. +
  5724. +typedef struct __data_info4 {
  5725. +    uint64_t offset;
  5726. +    uint64_t length;
  5727. +} data_info4;
  5728. +
  5729. +typedef enum __data_content4 {
  5730. +    NFS4_CONTENT_DATA = 0,
  5731. +    NFS4_CONTENT_HOLE = 1
  5732. +} data_content4;
  5733. +
  5734. +/* OP_READ_PLUS */
  5735. +typedef struct __nfs42_read_plus_args {
  5736. +    stateid_arg     *stateid; /* -> nfs41_op_open_res_ok.stateid */
  5737. +    uint64_t        offset;
  5738. +    uint32_t        count;
  5739. +} nfs42_read_plus_args;
  5740. +
  5741. +typedef union __nfs42_read_plus_content {
  5742. +    /* switch (data_content4 rpc_content) */
  5743. +    data_content4   content;
  5744. +    /* case NFS4_CONTENT_DATA: */
  5745. +    data4           data;
  5746. +    /* case NFS4_CONTENT_HOLE: */
  5747. +    data_info4      hole;
  5748. +    /* default: */
  5749. +} nfs42_read_plus_content;
  5750. +
  5751. +typedef struct __nfs42_read_plus_res_ok {
  5752. +    /*
  5753. +     * HACK: Copy of |nfs42_read_plus_args.offset| - needed because
  5754. +     * |nfs_op_decode_proc()| only has a |nfs_resop4| argument but
  5755. +     * no |nfs_argop4| argument (yet)
  5756. +     */
  5757. +    uint64_t                args_offset;
  5758. +
  5759. +    bool_t                  eof;
  5760. +    uint32_t                count;
  5761. +    /*
  5762. +     * We don't define a |nfs42_read_plus_content *contents| member
  5763. +     * here, because |decode_read_plus_res_ok()| only uses this
  5764. +     * internally and does not have an external consumer, saving a
  5765. +     * |malloc()|+|free()| in this case
  5766. +     */
  5767. +    unsigned char           *data; /* caller-allocated */
  5768. +    uint32_t                data_len;
  5769. +} nfs42_read_plus_res_ok;
  5770. +
  5771. +typedef struct __nfs42_read_plus_res {
  5772. +    uint32_t                status;
  5773. +    /* case NFS4_OK: */
  5774. +    nfs42_read_plus_res_ok  resok4;
  5775. +} nfs42_read_plus_res;
  5776.  
  5777.  /* OP_READDIR */
  5778.  typedef struct __nfs41_readdir_args {
  5779. @@ -1112,6 +1173,16 @@ int nfs41_read(
  5780.      OUT uint32_t *data_len_out,
  5781.      OUT bool_t *eof_out);
  5782.  
  5783. +int nfs42_read_plus(
  5784. +    IN nfs41_session *session,
  5785. +    IN nfs41_path_fh *file,
  5786. +    IN stateid_arg *stateid,
  5787. +    IN uint64_t offset,
  5788. +    IN uint32_t count,
  5789. +    OUT unsigned char *data_out,
  5790. +    OUT uint32_t *data_len_out,
  5791. +    OUT bool_t *eof_out);
  5792. +
  5793.  int nfs41_commit(
  5794.      IN nfs41_session *session,
  5795.      IN nfs41_path_fh *file,
  5796. diff --git a/daemon/nfs41_xdr.c b/daemon/nfs41_xdr.c
  5797. index f899b7b..1108950 100644
  5798. --- a/daemon/nfs41_xdr.c
  5799. +++ b/daemon/nfs41_xdr.c
  5800. @@ -1,5 +1,6 @@
  5801.  /* NFSv4.1 client for Windows
  5802. - * Copyright (C) 2012 The Regents of the University of Michigan
  5803. + * Copyright (C) 2012 The Regents of the University of Michigan
  5804. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  5805.   *
  5806.   * Olga Kornievskaia <aglo@umich.edu>
  5807.   * Casey Bodley <cbodley@umich.edu>
  5808. @@ -131,7 +132,7 @@ static bool_t xdr_settime4(
  5809.  }
  5810.  
  5811.  /* stateid4 */
  5812. -static bool_t xdr_stateid4(
  5813. +bool_t xdr_stateid4(
  5814.      XDR *xdr,
  5815.      stateid4 *si)
  5816.  {
  5817. @@ -2262,11 +2263,32 @@ static bool_t decode_read_res_ok(
  5818.      nfs41_read_res_ok *res)
  5819.  {
  5820.      unsigned char *data = res->data;
  5821. +    uint32_t data_len = res->data_len;
  5822. +    uint32_t count;
  5823.  
  5824.      if (!xdr_bool(xdr, &res->eof))
  5825.          return FALSE;
  5826.  
  5827. -    return xdr_bytes(xdr, (char **)&data, &res->data_len, NFS41_MAX_FILEIO_SIZE);
  5828. +    if (!xdr_u_int32_t(xdr, &count)) {
  5829. +        DPRINTF(0, ("decode_read_res_ok: decoding 'count' failed\n"));
  5830. +        return FALSE;
  5831. +    }
  5832. +
  5833. +    EASSERT(count <= data_len);
  5834. +    /*
  5835. +     * If a buggy server erroneously sends more data then we
  5836. +     * requested we'll clamp this via |__min()| to avoid an buffer
  5837. +     * overflow (but will still get an RPC error later).
  5838. +     */
  5839. +    count = __min(data_len, count);
  5840. +    if (!xdr_opaque(xdr, (char *)data, count)) {
  5841. +        DPRINTF(0, ("decode_read_res_ok_ decoding 'bytes' failed\n"));
  5842. +        return FALSE;
  5843. +    }
  5844. +
  5845. +    res->data_len = count;
  5846. +
  5847. +    return TRUE;
  5848.  }
  5849.  
  5850.  static bool_t decode_op_read(
  5851. @@ -3638,7 +3660,7 @@ static const op_table_entry g_op_table[] = {
  5852.      { NULL, NULL }, /* OP_LAYOUTSTATS = 65, */
  5853.      { NULL, NULL }, /* OP_OFFLOAD_CANCEL = 66, */
  5854.      { NULL, NULL }, /* OP_OFFLOAD_STATUS = 67, */
  5855. -    { NULL, NULL }, /* OP_READ_PLUS = 68, */
  5856. +    { encode_op_read_plus, decode_op_read_plus }, /* OP_READ_PLUS = 68, */
  5857.      { NULL, NULL }, /* OP_SEEK = 69, */
  5858.      { NULL, NULL }, /* OP_WRITE_SAME = 70, */
  5859.      { NULL, NULL }, /* OP_CLONE = 71, */
  5860. diff --git a/daemon/nfs41_xdr.h b/daemon/nfs41_xdr.h
  5861. index 9a3fc61..0b320bd 100644
  5862. --- a/daemon/nfs41_xdr.h
  5863. +++ b/daemon/nfs41_xdr.h
  5864. @@ -1,8 +1,10 @@
  5865.  /* NFSv4.1 client for Windows
  5866. - * Copyright (C) 2012 The Regents of the University of Michigan
  5867. + * Copyright (C) 2012 The Regents of the University of Michigan
  5868. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  5869.   *
  5870.   * Olga Kornievskaia <aglo@umich.edu>
  5871.   * Casey Bodley <cbodley@umich.edu>
  5872. + * Roland Mainz <roland.mainz@nrubsig.org>
  5873.   *
  5874.   * This library is free software; you can redistribute it and/or modify it
  5875.   * under the terms of the GNU Lesser General Public License as published by
  5876. @@ -23,10 +25,16 @@
  5877.  #define __NFS41_NFS_XDR_H__
  5878.  
  5879.  #include "nfs41_types.h"
  5880. +#include "nfs41_compound.h"
  5881.  
  5882.  bool_t nfs_encode_compound(XDR *xdr, caddr_t *args);
  5883.  bool_t nfs_decode_compound(XDR *xdr, caddr_t *res);
  5884.  
  5885.  void nfsacl41_free(nfsacl41 *acl);
  5886. +bool_t xdr_stateid4(XDR *xdr, stateid4 *si);
  5887. +
  5888. +/* NFSv4.2 ops */
  5889. +bool_t encode_op_read_plus(XDR *xdr, nfs_argop4 *argop);
  5890. +bool_t decode_op_read_plus(XDR *xdr, nfs_resop4 *resop);
  5891.  
  5892.  #endif /* !__NFS41_NFS_XDR_H__ */
  5893. diff --git a/daemon/nfs42_ops.c b/daemon/nfs42_ops.c
  5894. new file mode 100644
  5895. index 0000000..287fd2e
  5896. --- /dev/null
  5897. +++ b/daemon/nfs42_ops.c
  5898. @@ -0,0 +1,96 @@
  5899. +/* NFSv4.1 client for Windows
  5900. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  5901. + *
  5902. + * Roland Mainz <roland.mainz@nrubsig.org>
  5903. + *
  5904. + * This library is free software; you can redistribute it and/or modify it
  5905. + * under the terms of the GNU Lesser General Public License as published by
  5906. + * the Free Software Foundation; either version 2.1 of the License, or (at
  5907. + * your option) any later version.
  5908. + *
  5909. + * This library is distributed in the hope that it will be useful, but
  5910. + * without any warranty; without even the implied warranty of merchantability
  5911. + * or fitness for a particular purpose.  See the GNU Lesser General Public
  5912. + * License for more details.
  5913. + *
  5914. + * You should have received a copy of the GNU Lesser General Public License
  5915. + * along with this library; if not, write to the Free Software Foundation,
  5916. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  5917. + */
  5918. +
  5919. +#include <Windows.h>
  5920. +#include <strsafe.h>
  5921. +#include <stdio.h>
  5922. +#include <stdlib.h>
  5923. +#include <time.h>
  5924. +
  5925. +#include "nfs41_build_features.h"
  5926. +#include "nfs41_daemon.h"
  5927. +#include "nfs41_ops.h"
  5928. +#include "nfs41_compound.h"
  5929. +#include "nfs41_xdr.h"
  5930. +#include "name_cache.h"
  5931. +#include "delegation.h"
  5932. +#include "daemon_debug.h"
  5933. +#include "util.h"
  5934. +
  5935. +int nfs42_read_plus(
  5936. +    IN nfs41_session *session,
  5937. +    IN nfs41_path_fh *file,
  5938. +    IN stateid_arg *stateid,
  5939. +    IN uint64_t offset,
  5940. +    IN uint32_t count,
  5941. +    OUT unsigned char *data_out,
  5942. +    OUT uint32_t *data_len_out,
  5943. +    OUT bool_t *eof_out)
  5944. +{
  5945. +    int status;
  5946. +    nfs41_compound compound;
  5947. +    nfs_argop4 argops[4];
  5948. +    nfs_resop4 resops[4];
  5949. +    nfs41_sequence_args sequence_args;
  5950. +    nfs41_sequence_res sequence_res;
  5951. +    nfs41_putfh_args putfh_args;
  5952. +    nfs41_putfh_res putfh_res;
  5953. +    nfs42_read_plus_args read_plus_args;
  5954. +    nfs42_read_plus_res read_plus_res;
  5955. +
  5956. +    compound_init(&compound, session->client->root->nfsminorvers,
  5957. +        argops, resops,
  5958. +        stateid->stateid.seqid == 0 ? "ds read_plus" : "read_plus");
  5959. +
  5960. +    compound_add_op(&compound, OP_SEQUENCE, &sequence_args, &sequence_res);
  5961. +    nfs41_session_sequence(&sequence_args, session, 0);
  5962. +
  5963. +    compound_add_op(&compound, OP_PUTFH, &putfh_args, &putfh_res);
  5964. +    putfh_args.file = file;
  5965. +    putfh_args.in_recovery = 0;
  5966. +
  5967. +    compound_add_op(&compound, OP_READ_PLUS, &read_plus_args, &read_plus_res);
  5968. +    read_plus_args.stateid = stateid;
  5969. +    read_plus_args.offset = offset;
  5970. +    read_plus_args.count = count;
  5971. +    read_plus_res.resok4.args_offset = offset; /* hack */
  5972. +    read_plus_res.resok4.data_len = count;
  5973. +    read_plus_res.resok4.data = data_out;
  5974. +
  5975. +    status = compound_encode_send_decode(session, &compound, TRUE);
  5976. +    if (status)
  5977. +        goto out;
  5978. +
  5979. +    if (compound_error(status = compound.res.status))
  5980. +        goto out;
  5981. +
  5982. +    *data_len_out = read_plus_res.resok4.data_len;
  5983. +    *eof_out = read_plus_res.resok4.eof;
  5984. +
  5985. +    /* we shouldn't ever see this, but a buggy server could
  5986. +     * send us into an infinite loop. return NFS4ERR_IO */
  5987. +    if (!read_plus_res.resok4.data_len && !read_plus_res.resok4.eof) {
  5988. +        status = NFS4ERR_IO;
  5989. +        eprintf("READ_PLUS succeeded with len=0 and eof=0; returning '%s'\n",
  5990. +            nfs_error_string(status));
  5991. +    }
  5992. +out:
  5993. +    return status;
  5994. +}
  5995. diff --git a/daemon/nfs42_xdr.c b/daemon/nfs42_xdr.c
  5996. new file mode 100644
  5997. index 0000000..ab56c19
  5998. --- /dev/null
  5999. +++ b/daemon/nfs42_xdr.c
  6000. @@ -0,0 +1,192 @@
  6001. +/* NFSv4.1 client for Windows
  6002. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  6003. + *
  6004. + * Roland Mainz <roland.mainz@nrubsig.org>
  6005. + *
  6006. + * This library is free software; you can redistribute it and/or modify it
  6007. + * under the terms of the GNU Lesser General Public License as published by
  6008. + * the Free Software Foundation; either version 2.1 of the License, or (at
  6009. + * your option) any later version.
  6010. + *
  6011. + * This library is distributed in the hope that it will be useful, but
  6012. + * without any warranty; without even the implied warranty of merchantability
  6013. + * or fitness for a particular purpose.  See the GNU Lesser General Public
  6014. + * License for more details.
  6015. + *
  6016. + * You should have received a copy of the GNU Lesser General Public License
  6017. + * along with this library; if not, write to the Free Software Foundation,
  6018. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  6019. + */
  6020. +
  6021. +#include <Windows.h>
  6022. +#include <strsafe.h>
  6023. +
  6024. +#include "nfs41_compound.h"
  6025. +#include "nfs41_ops.h"
  6026. +#include "nfs41_xdr.h"
  6027. +#include "util.h"
  6028. +#include "daemon_debug.h"
  6029. +#include "rpc/rpc.h"
  6030. +
  6031. +/* fixme: copy from nfs41_xdr.c */
  6032. +static __inline int unexpected_op(uint32_t op, uint32_t expected)
  6033. +{
  6034. +    if (op == expected)
  6035. +        return 0;
  6036. +
  6037. +    eprintf("Op table mismatch. Got '%s' (%d), expected '%s' (%d).\n",
  6038. +        nfs_opnum_to_string(op), op,
  6039. +        nfs_opnum_to_string(expected), expected);
  6040. +    return 1;
  6041. +}
  6042. +
  6043. +/*
  6044. + * OP_READ_PLUS
  6045. + */
  6046. +bool_t encode_op_read_plus(
  6047. +    XDR *xdr,
  6048. +    nfs_argop4 *argop)
  6049. +{
  6050. +    nfs42_read_plus_args *args = (nfs42_read_plus_args *)argop->arg;
  6051. +
  6052. +    if (unexpected_op(argop->op, OP_READ_PLUS))
  6053. +        return FALSE;
  6054. +
  6055. +    if (!xdr_stateid4(xdr, &args->stateid->stateid))
  6056. +        return FALSE;
  6057. +
  6058. +    if (!xdr_u_hyper(xdr, &args->offset))
  6059. +        return FALSE;
  6060. +
  6061. +    return xdr_u_int32_t(xdr, &args->count);
  6062. +}
  6063. +
  6064. +static bool_t decode_read_plus_res_ok(
  6065. +    XDR *xdr,
  6066. +    nfs42_read_plus_res_ok *res)
  6067. +{
  6068. +    nfs42_read_plus_content *contents = NULL;
  6069. +    uint64_t read_data_len = 0ULL;
  6070. +
  6071. +    if (!xdr_bool(xdr, &res->eof)) {
  6072. +        DPRINTF(0, ("decode eof failed\n"));
  6073. +        return FALSE;
  6074. +    }
  6075. +
  6076. +    if (!xdr_u_int32_t(xdr, &res->count)) {
  6077. +        DPRINTF(0, ("decode count failed\n"));
  6078. +        return FALSE;
  6079. +    }
  6080. +
  6081. +    /*
  6082. +     * Note that |res->count==0| is a valid value for "READ_PLUS"
  6083. +     * replies
  6084. +     */
  6085. +    if (res->count == 0) {
  6086. +        res->data_len = 0L;
  6087. +        return TRUE;
  6088. +    }
  6089. +
  6090. +    contents = _alloca(res->count * sizeof(nfs42_read_plus_content));
  6091. +
  6092. +    uint32_t i, co;
  6093. +
  6094. +    for (i = 0 ; i < res->count ; i++) {
  6095. +        if (!xdr_u_int32_t(xdr, &co)) {
  6096. +            DPRINTF(0, ("i=%d, decode co failed\n", (int)i));
  6097. +            return FALSE;
  6098. +        }
  6099. +        contents[i].content = co;
  6100. +
  6101. +        switch(co) {
  6102. +            case NFS4_CONTENT_DATA:
  6103. +                if (!xdr_u_hyper(xdr, &contents[i].data.offset)) {
  6104. +                    DPRINTF(0,
  6105. +                        ("i=%d, decoding 'offset' failed\n", (int)i));
  6106. +                    return FALSE;
  6107. +                }
  6108. +                if (!xdr_u_int32_t(xdr, &contents[i].data.count)) {
  6109. +                    DPRINTF(0,
  6110. +                        ("i=%d, decoding 'count' failed\n", (int)i));
  6111. +                    return FALSE;
  6112. +                }
  6113. +
  6114. +                contents[i].data.data = res->data +
  6115. +                    (contents[i].data.offset - res->args_offset);
  6116. +                contents[i].data.data_len = contents[i].data.count;
  6117. +
  6118. +                EASSERT(((contents[i].data.data - res->data) +
  6119. +                    contents[i].data.data_len) <= res->data_len);
  6120. +                if (!xdr_opaque(xdr,
  6121. +                    (char *)contents[i].data.data,
  6122. +                    contents[i].data.data_len)) {
  6123. +                    DPRINTF(0,
  6124. +                        ("i=%d, decoding 'bytes' failed\n", (int)i));
  6125. +                    return FALSE;
  6126. +                }
  6127. +                read_data_len = __max(read_data_len,
  6128. +                    ((size_t)(contents[i].data.data - res->data) +
  6129. +                        contents[i].data.data_len));
  6130. +                break;
  6131. +            case NFS4_CONTENT_HOLE:
  6132. +                unsigned char *hole_buff;
  6133. +                uint64_t hole_length;
  6134. +
  6135. +                DPRINTF(0,
  6136. +                    ("i=%d, 'NFS4_CONTENT_HOLE' content\n", (int)i));
  6137. +                if (!xdr_u_hyper(xdr, &contents[i].hole.offset))
  6138. +                    return FALSE;
  6139. +                if (!xdr_u_hyper(xdr, &contents[i].hole.length))
  6140. +                    return FALSE;
  6141. +
  6142. +
  6143. +                hole_buff = res->data +
  6144. +                    (contents[i].hole.offset - res->args_offset);
  6145. +                hole_length = contents[i].hole.length;
  6146. +
  6147. +                /*
  6148. +                 * NFSv4.2 "READ_PLUS" is required to return the
  6149. +                 * whole hole even if |hole.length| is bigger than
  6150. +                 * the requested size
  6151. +                 */
  6152. +                if (((hole_buff - res->data) + hole_length) >
  6153. +                    res->data_len) {
  6154. +                    hole_length = res->data_len;
  6155. +                }
  6156. +
  6157. +                EASSERT(hole_length < UINT_MAX);
  6158. +                (void)memset(hole_buff, 0, (size_t)hole_length);
  6159. +
  6160. +                read_data_len = __max(read_data_len,
  6161. +                    ((hole_buff - res->data) + hole_length));
  6162. +                break;
  6163. +            default:
  6164. +                eprintf("decode_read_plus_res_ok: unknown co=%d\n",
  6165. +                    (int)co);
  6166. +                return FALSE;
  6167. +        }
  6168. +    }
  6169. +
  6170. +    EASSERT(read_data_len < UINT_MAX);
  6171. +    res->data_len = (uint32_t)read_data_len;
  6172. +    return TRUE;
  6173. +}
  6174. +
  6175. +bool_t decode_op_read_plus(
  6176. +    XDR *xdr,
  6177. +    nfs_resop4 *resop)
  6178. +{
  6179. +    nfs42_read_plus_res *res = (nfs42_read_plus_res *)resop->res;
  6180. +
  6181. +    if (unexpected_op(resop->op, OP_READ_PLUS))
  6182. +        return FALSE;
  6183. +
  6184. +    if (!xdr_u_int32_t(xdr, &res->status))
  6185. +        return FALSE;
  6186. +
  6187. +    if (res->status == NFS4_OK)
  6188. +        return decode_read_plus_res_ok(xdr, &res->resok4);
  6189. +
  6190. +    return TRUE;
  6191. +}
  6192. +
  6193. diff --git a/daemon/readwrite.c b/daemon/readwrite.c
  6194. index 355336a..7a079b5 100644
  6195. --- a/daemon/readwrite.c
  6196. +++ b/daemon/readwrite.c
  6197. @@ -1,5 +1,6 @@
  6198.  /* NFSv4.1 client for Windows
  6199. - * Copyright (C) 2012 The Regents of the University of Michigan
  6200. + * Copyright (C) 2012 The Regents of the University of Michigan
  6201. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  6202.   *
  6203.   * Olga Kornievskaia <aglo@umich.edu>
  6204.   * Casey Bodley <cbodley@umich.edu>
  6205. @@ -77,8 +78,21 @@ static int read_from_mds(
  6206.      while(to_rcv > 0) {
  6207.          uint32_t bytes_read = 0, chunk = min(to_rcv, maxreadsize);
  6208.  
  6209. -        status = nfs41_read(session, file, stateid, args->offset + reloffset, chunk,
  6210. +        if (session->client->root->supports_nfs42_read_plus) {
  6211. +            status = nfs42_read_plus(session, file, stateid,
  6212. +                args->offset + reloffset, chunk,
  6213.                  p, &bytes_read, &eof);
  6214. +            if (status) {
  6215. +                DPRINTF(0, ("nfs42_read_plus() failed, status=%d\n", status));
  6216. +                session->client->root->supports_nfs42_read_plus = false;
  6217. +            }
  6218. +        }
  6219. +        else {
  6220. +            status = nfs41_read(session, file, stateid,
  6221. +                args->offset + reloffset, chunk,
  6222. +                p, &bytes_read, &eof);
  6223. +        }
  6224. +
  6225.          if (status == NFS4ERR_OPENMODE && !len) {
  6226.              stateid->type = STATEID_SPECIAL;
  6227.              stateid4_cpy(&stateid->stateid, &special_read_stateid);
  6228. diff --git a/daemon/recovery.c b/daemon/recovery.c
  6229. index eee4031..44b996e 100644
  6230. --- a/daemon/recovery.c
  6231. +++ b/daemon/recovery.c
  6232. @@ -1,5 +1,6 @@
  6233.  /* NFSv4.1 client for Windows
  6234. - * Copyright (C) 2012 The Regents of the University of Michigan
  6235. + * Copyright (C) 2012 The Regents of the University of Michigan
  6236. + * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  6237.   *
  6238.   * Olga Kornievskaia <aglo@umich.edu>
  6239.   * Casey Bodley <cbodley@umich.edu>
  6240. @@ -805,6 +806,9 @@ bool_t nfs41_recover_stateid(
  6241.      } else if (argop->op == OP_READ) {
  6242.          nfs41_read_args *read = (nfs41_read_args*)argop->arg;
  6243.          stateid = read->stateid;
  6244. +    } else if (argop->op == OP_READ_PLUS) {
  6245. +        nfs42_read_plus_args *read_plus = (nfs42_read_plus_args *)argop->arg;
  6246. +        stateid = read_plus->stateid;
  6247.      } else if (argop->op == OP_WRITE) {
  6248.          nfs41_write_args *write = (nfs41_write_args*)argop->arg;
  6249.          stateid = write->stateid;
  6250. --
  6251. 2.45.1

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at