pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for libtirpc&co compiler warnings, cleanup, prio-inversion+misc, 2024-09-28
Posted by Anonymous on Sat 28th Sep 2024 15:05
raw | new post

  1. From 4456a196a5b4caf7073f6d0ae7758519d7293acf Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Sat, 28 Sep 2024 10:59:50 +0200
  4. Subject: [PATCH 01/11] libtirpc: Add comment why we prefer |SRWLOCK| for
  5.  |mutex_t|
  6.  
  7. Add comment why we prefer |SRWLOCK| for |mutex_t|
  8.  
  9. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  10. ---
  11. libtirpc/tirpc/reentrant.h | 4 ++++
  12.  1 file changed, 4 insertions(+)
  13.  
  14. diff --git a/libtirpc/tirpc/reentrant.h b/libtirpc/tirpc/reentrant.h
  15. index 51e2db1..0d48b82 100644
  16. --- a/libtirpc/tirpc/reentrant.h
  17. +++ b/libtirpc/tirpc/reentrant.h
  18. @@ -119,6 +119,10 @@
  19.  /*
  20.   * |USE_SRWLOCK_FOR_MUTEX| - Use SRWLOCK for |mutex_t| instead of a
  21.   * |CRITICAL_SECTION|
  22. + * We prefer SRWLOCKs here because in our use case the performace is
  23. + * simiar to CRITICAL_SECTIONs, initalisation can be done with
  24. + * SRWLOCK_INIT and SRWLOCK does not require an explicit cleanup
  25. + * (i.e. it can be "forgotten" without being explicitly destroyed).
  26.   */
  27.  #define USE_SRWLOCK_FOR_MUTEX 1
  28.  
  29. --
  30. 2.45.1
  31.  
  32. From 8e7a491b87566b8f7be2f7a32024069522b430c1 Mon Sep 17 00:00:00 2001
  33. From: Roland Mainz <roland.mainz@nrubsig.org>
  34. Date: Sat, 28 Sep 2024 11:16:05 +0200
  35. Subject: [PATCH 02/11] libtirpc: Split |rwlock_unlock()| into
  36.  |rwlock_rdunlock()|+|rwlock_wrunlock()|
  37.  
  38. Split |rwlock_unlock()| into |rwlock_rdunlock()|+|rwlock_wrunlock()|
  39. for system API (e.g. Win32 |SRWLOCK|) which have separate unlock
  40. functions for shared+exclusive locking.
  41.  
  42. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  43. ---
  44. libtirpc/src/rpcb_clnt.c   |  8 ++++----
  45.  libtirpc/src/svc.c         | 23 ++++++++++++-----------
  46.  libtirpc/src/svc_run.c     |  4 ++--
  47.  libtirpc/src/svc_vc.c      |  2 +-
  48.  libtirpc/tirpc/reentrant.h |  7 ++++---
  49.  5 files changed, 23 insertions(+), 21 deletions(-)
  50.  
  51. diff --git a/libtirpc/src/rpcb_clnt.c b/libtirpc/src/rpcb_clnt.c
  52. index 5e94d33..d9806f3 100644
  53. --- a/libtirpc/src/rpcb_clnt.c
  54. +++ b/libtirpc/src/rpcb_clnt.c
  55. @@ -264,7 +264,7 @@ add_cache(host, netid, taddr, uaddr)
  56.                 }
  57.                 free(cptr);
  58.         }
  59. -       rwlock_unlock(&rpcbaddr_cache_lock);
  60. +       rwlock_wrunlock(&rpcbaddr_cache_lock);
  61.  }
  62.  
  63.  /*
  64. @@ -304,7 +304,7 @@ getclnthandle(host, nconf, targaddr)
  65.                 if (client != NULL) {
  66.                         if (targaddr)
  67.                                 *targaddr = strdup(ad_cache->ac_uaddr);
  68. -                       rwlock_unlock(&rpcbaddr_cache_lock);
  69. +                       rwlock_rdunlock(&rpcbaddr_cache_lock);
  70.                         return (client);
  71.                 }
  72.                 addr_to_delete.len = addr->len;
  73. @@ -315,7 +315,7 @@ getclnthandle(host, nconf, targaddr)
  74.                         memcpy(addr_to_delete.buf, addr->buf, addr->len);
  75.                 }
  76.         }
  77. -       rwlock_unlock(&rpcbaddr_cache_lock);
  78. +       rwlock_rdunlock(&rpcbaddr_cache_lock);
  79.         if (addr_to_delete.len != 0) {
  80.                 /*
  81.                  * Assume this may be due to cache data being
  82. @@ -323,7 +323,7 @@ getclnthandle(host, nconf, targaddr)
  83.                  */
  84.                 rwlock_wrlock(&rpcbaddr_cache_lock);
  85.                 delete_cache(&addr_to_delete);
  86. -               rwlock_unlock(&rpcbaddr_cache_lock);
  87. +               rwlock_rdunlock(&rpcbaddr_cache_lock);
  88.                 free(addr_to_delete.buf);
  89.         }
  90.         if (!__rpc_nconf2sockinfo(nconf, &si)) {
  91. diff --git a/libtirpc/src/svc.c b/libtirpc/src/svc.c
  92. index 6826831..7d8fd1d 100644
  93. --- a/libtirpc/src/svc.c
  94. +++ b/libtirpc/src/svc.c
  95. @@ -108,7 +108,7 @@ xprt_register (xprt)
  96.        __svc_xports = (SVCXPRT **) mem_alloc (FD_SETSIZE * sizeof (SVCXPRT *));
  97.           if (__svc_xports == NULL) {
  98.          // XXX Give an error indication?
  99. -        return;
  100. +        goto out;
  101.        }
  102.        memset (__svc_xports, 0, FD_SETSIZE * sizeof (SVCXPRT *));
  103.    }
  104. @@ -121,7 +121,8 @@ xprt_register (xprt)
  105.  #else
  106.    fprintf(stderr, "%s: Yikes!  Figure out __svc_xports[] issue!!\n", __func__);
  107.  #endif
  108. -  rwlock_unlock (&svc_fd_lock);
  109. +out:
  110. +  rwlock_wrunlock (&svc_fd_lock);
  111.  }
  112.  
  113.  void
  114. @@ -163,7 +164,7 @@ bool_t dolock;
  115.      }
  116.    }
  117.    if (dolock)
  118. -    rwlock_unlock (&svc_fd_lock);
  119. +    rwlock_wrunlock (&svc_fd_lock);
  120.  #else
  121.    fprintf(stderr, "%s: Yikes!  Figure out __svc_xports[] issue!!\n", __func__);
  122.  #endif
  123. @@ -218,7 +219,7 @@ svc_reg (xprt, prog, vers, dispatch, nconf)
  124.         free (netid);
  125.        if (s->sc_dispatch == dispatch)
  126.         goto rpcb_it;           /* he is registering another xptr */
  127. -      rwlock_unlock (&svc_lock);
  128. +      rwlock_wrunlock (&svc_lock);
  129.        return (FALSE);
  130.      }
  131.    s = mem_alloc (sizeof (struct svc_callout));
  132. @@ -226,7 +227,7 @@ svc_reg (xprt, prog, vers, dispatch, nconf)
  133.      {
  134.        if (netid)
  135.         free (netid);
  136. -      rwlock_unlock (&svc_lock);
  137. +      rwlock_wrunlock (&svc_lock);
  138.        return (FALSE);
  139.      }
  140.  
  141. @@ -241,7 +242,7 @@ svc_reg (xprt, prog, vers, dispatch, nconf)
  142.      ((SVCXPRT *) xprt)->xp_netid = strdup (netid);
  143.  
  144.  rpcb_it:
  145. -  rwlock_unlock (&svc_lock);
  146. +  rwlock_wrunlock (&svc_lock);
  147.    /* now register the information with the local binder service */
  148.    if (nconf)
  149.      {
  150. @@ -282,7 +283,7 @@ svc_unreg (prog, vers)
  151.         mem_free (s->sc_netid, sizeof (s->sc_netid) + 1);
  152.        mem_free (s, sizeof (struct svc_callout));
  153.      }
  154. -  rwlock_unlock (&svc_lock);
  155. +  rwlock_wrunlock (&svc_lock);
  156.  }
  157.  
  158.  /* ********************** CALLOUT list related stuff ************* */
  159. @@ -655,7 +656,7 @@ svc_getreq_common (int fd)
  160.  
  161.    rwlock_rdlock (&svc_fd_lock);
  162.    xprt = __svc_xports[fd];
  163. -  rwlock_unlock (&svc_fd_lock);
  164. +  rwlock_rdunlock (&svc_fd_lock);
  165.    if (xprt == NULL)
  166.      /* But do we control sock? */
  167.      return;
  168. @@ -719,10 +720,10 @@ svc_getreq_common (int fd)
  169.        
  170.        if (xprt != __svc_xports[fd])
  171.         {
  172. -         rwlock_unlock (&svc_fd_lock);
  173. +         rwlock_rdunlock (&svc_fd_lock);
  174.           break;
  175.         }
  176. -      rwlock_unlock (&svc_fd_lock);
  177. +      rwlock_rdunlock (&svc_fd_lock);
  178.      call_done:
  179.        if ((stat = SVC_STAT (xprt)) == XPRT_DIED)
  180.         {
  181. @@ -772,7 +773,7 @@ svc_getreq_poll (pfdp, pollretval)
  182.             {
  183.               rwlock_wrlock (&svc_fd_lock);
  184.               FD_CLR (p->fd, &svc_fdset);
  185. -             rwlock_unlock (&svc_fd_lock);
  186. +             rwlock_wrunlock (&svc_fd_lock);
  187.             }
  188.           else
  189.             svc_getreq_common (wintirpc_handle2fd(p->fd));
  190. diff --git a/libtirpc/src/svc_run.c b/libtirpc/src/svc_run.c
  191. index 842b5bf..a525a35 100644
  192. --- a/libtirpc/src/svc_run.c
  193. +++ b/libtirpc/src/svc_run.c
  194. @@ -56,7 +56,7 @@ svc_run()
  195.                 rwlock_rdlock(&svc_fd_lock);
  196.                 readfds = svc_fdset;
  197.                 cleanfds = svc_fdset;
  198. -               rwlock_unlock(&svc_fd_lock);
  199. +               rwlock_rdunlock(&svc_fd_lock);
  200.                 timeout.tv_sec = 30;
  201.                 timeout.tv_usec = 0;
  202.                 switch (select(svc_maxfd+1, &readfds, NULL, NULL, &timeout)) {
  203. @@ -87,5 +87,5 @@ svc_exit()
  204.  
  205.         rwlock_wrlock(&svc_fd_lock);
  206.         FD_ZERO(&svc_fdset);
  207. -       rwlock_unlock(&svc_fd_lock);
  208. +       rwlock_wrunlock(&svc_fd_lock);
  209.  }
  210. diff --git a/libtirpc/src/svc_vc.c b/libtirpc/src/svc_vc.c
  211. index 229844f..5fa88f5 100644
  212. --- a/libtirpc/src/svc_vc.c
  213. +++ b/libtirpc/src/svc_vc.c
  214. @@ -847,6 +847,6 @@ __svc_clean_idle(fd_set *fds, int timeout, bool_t cleanblock)
  215.                 __svc_vc_dodestroy(least_active);
  216.                 ncleaned++;
  217.         }
  218. -       rwlock_unlock(&svc_fd_lock);
  219. +       rwlock_wrunlock(&svc_fd_lock);
  220.         return ncleaned > 0 ? TRUE : FALSE;
  221.  }
  222. diff --git a/libtirpc/tirpc/reentrant.h b/libtirpc/tirpc/reentrant.h
  223. index 0d48b82..afc09b0 100644
  224. --- a/libtirpc/tirpc/reentrant.h
  225. +++ b/libtirpc/tirpc/reentrant.h
  226. @@ -169,8 +169,8 @@
  227.  #define rwlock_init(l, a)              InitializeSRWLock(l)
  228.  #define rwlock_rdlock(l)               AcquireSRWLockShared(l)
  229.  #define rwlock_wrlock(l)               AcquireSRWLockExclusive(l)
  230. -/* XXX Code will have to be changed to release the right kind!!! XXX */
  231. -#define rwlock_unlock(l)               ReleaseSRWLockExclusive(l)
  232. +#define rwlock_rdunlock(l)             ReleaseSRWLockShared(l)
  233. +#define rwlock_wrunlock(l)             ReleaseSRWLockExclusive(l)
  234.  
  235.  #define thr_keycreate(k, d)            ((*k) = TlsAlloc())
  236.  #define thr_keydelete(k)               TlsFree(k)
  237. @@ -202,7 +202,8 @@
  238.  #define rwlock_init(l, a)        pthread_rwlock_init(l, a)
  239.  #define rwlock_rdlock(l)        pthread_rwlock_rdlock(l)
  240.  #define rwlock_wrlock(l)        pthread_rwlock_wrlock(l)
  241. -#define rwlock_unlock(l)        pthread_rwlock_unlock(l)
  242. +#define rwlock_rdunlock(l)      pthread_rwlock_unlock(l)
  243. +#define rwlock_wrunlock(l)      pthread_rwlock_unlock(l)
  244.  
  245.  #define thr_keycreate(k, d)     pthread_key_create(k, d)
  246.  #define thr_keydelete(k)        pthread_key_delete(k)
  247. --
  248. 2.45.1
  249.  
  250. From 472d31676e42f2d51c6293c5140c05a8c65a9598 Mon Sep 17 00:00:00 2001
  251. From: Roland Mainz <roland.mainz@nrubsig.org>
  252. Date: Sat, 28 Sep 2024 12:08:10 +0200
  253. Subject: [PATCH 03/11] libtirpc: Fix |SOCKET|+fd init+casting/compare warnings
  254.  
  255. Fix |SOCKET|+fd init+casting/compare warnings
  256.  
  257. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  258. ---
  259. libtirpc/src/auth_time.c    |  2 +-
  260.  libtirpc/src/bindresvport.c |  2 +-
  261.  libtirpc/src/clnt_bcast.c   |  4 ++--
  262.  libtirpc/src/clnt_dg.c      |  2 +-
  263.  libtirpc/src/clnt_generic.c |  2 +-
  264.  libtirpc/src/clnt_vc.c      |  4 ++--
  265.  libtirpc/src/pmap_getmaps.c |  2 +-
  266.  libtirpc/src/rtime.c        |  2 +-
  267.  libtirpc/src/svc.c          |  6 +++---
  268.  libtirpc/src/svc_vc.c       |  2 +-
  269.  libtirpc/src/wintirpc.c     | 17 +++++++++++------
  270.  libtirpc/tirpc/rpc/svc.h    |  2 +-
  271.  libtirpc/tirpc/wintirpc.h   |  3 ++-
  272.  13 files changed, 28 insertions(+), 22 deletions(-)
  273.  
  274. diff --git a/libtirpc/src/auth_time.c b/libtirpc/src/auth_time.c
  275. index bce1df4..854442b 100644
  276. --- a/libtirpc/src/auth_time.c
  277. +++ b/libtirpc/src/auth_time.c
  278. @@ -403,7 +403,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
  279.                         }
  280.                         do {
  281.                                 FD_ZERO(&readfds);
  282. -                               FD_SET(_get_osfhandle(s), &readfds);
  283. +                               FD_SET(wintirpc_fd2sockethandle(s), &readfds);
  284.                                 res = select(_rpc_dtablesize(), &readfds,
  285.                                         (fd_set *)NULL, (fd_set *)NULL, &timeout);
  286.                         } while (res == (int)SOCKET_ERROR && WSAGetLastError() == WSAEINTR);
  287. diff --git a/libtirpc/src/bindresvport.c b/libtirpc/src/bindresvport.c
  288. index d344c25..50e1669 100644
  289. --- a/libtirpc/src/bindresvport.c
  290. +++ b/libtirpc/src/bindresvport.c
  291. @@ -185,7 +185,7 @@ bindresvport_sa(int sd, struct sockaddr *sa)
  292.                 "bindresvport_sa_last_n=%d\n",
  293.                 sd, sa, bindresvport_sa_last_n));
  294.  
  295. -       sd_sock = _get_osfhandle(sd);
  296. +       sd_sock = wintirpc_fd2sockethandle(sd);
  297.  
  298.         for (n = 0 ; n < NPORTS ; n++) {
  299.                 currport = ((n+bindresvport_sa_last_n)%NPORTS)+STARTPORT;
  300. diff --git a/libtirpc/src/clnt_bcast.c b/libtirpc/src/clnt_bcast.c
  301. index 411a3b2..9d6c13d 100644
  302. --- a/libtirpc/src/clnt_bcast.c
  303. +++ b/libtirpc/src/clnt_bcast.c
  304. @@ -355,13 +355,13 @@ rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp,
  305.                         continue;
  306.  
  307.                 fd = wintirpc_socket(si.si_af, si.si_socktype, si.si_proto);
  308. -               if (fd == INVALID_SOCKET) {
  309. +               if (fd < 0) {
  310.                         stat = RPC_CANTSEND;
  311.                         continue;
  312.                 }
  313.                 fdlist[fdlistno].af = si.si_af;
  314.                 fdlist[fdlistno].proto = si.si_proto;
  315. -               fdlist[fdlistno].fd_sock = _get_osfhandle(fd);
  316. +               fdlist[fdlistno].fd_sock = wintirpc_fd2sockethandle(fd);
  317.                 fdlist[fdlistno].fd = fd;
  318.                 fdlist[fdlistno].nconf = nconf;
  319.                 fdlist[fdlistno].asize = __rpc_get_a_size(si.si_af);
  320. diff --git a/libtirpc/src/clnt_dg.c b/libtirpc/src/clnt_dg.c
  321. index 7b0c981..2af300a 100644
  322. --- a/libtirpc/src/clnt_dg.c
  323. +++ b/libtirpc/src/clnt_dg.c
  324. @@ -284,7 +284,7 @@ clnt_dg_create(fd, svcaddr, program, version, sendsz, recvsz)
  325.         wintirpc_setsockopt(fd, SOL_IP, IP_RECVERR, &on, sizeof(on));
  326.         }
  327.  #endif
  328. -       ioctlsocket(_get_osfhandle(fd), FIONBIO, &one);
  329. +       ioctlsocket(wintirpc_fd2sockethandle(fd), FIONBIO, &one);
  330.         /*
  331.          * By default, closeit is always FALSE. It is users responsibility
  332.          * to do a close on it, else the user may use clnt_control
  333. diff --git a/libtirpc/src/clnt_generic.c b/libtirpc/src/clnt_generic.c
  334. index a39df89..de087a2 100644
  335. --- a/libtirpc/src/clnt_generic.c
  336. +++ b/libtirpc/src/clnt_generic.c
  337. @@ -368,7 +368,7 @@ clnt_tli_create(const int fd_in, const struct netconfig *nconf,
  338.  
  339.                 fd = __rpc_nconf2fd(nconf);
  340.  
  341. -               if (fd == INVALID_SOCKET)
  342. +               if (fd == -1)
  343.                         goto err;
  344.  #if 0
  345.                 if (fd < __rpc_minfd)
  346. diff --git a/libtirpc/src/clnt_vc.c b/libtirpc/src/clnt_vc.c
  347. index ddfdde5..858f7f3 100644
  348. --- a/libtirpc/src/clnt_vc.c
  349. +++ b/libtirpc/src/clnt_vc.c
  350. @@ -459,7 +459,7 @@ clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz, cb_xdr, cb_fn, cb_args)
  351.          * XXX - fvdl connecting while holding a mutex?
  352.          */
  353.         slen = sizeof ss;
  354. -       if (getpeername(_get_osfhandle(fd), (struct sockaddr *)&ss, &slen) == SOCKET_ERROR) {
  355. +       if (getpeername(wintirpc_fd2sockethandle(fd), (struct sockaddr *)&ss, &slen) == SOCKET_ERROR) {
  356.                 errno = WSAGetLastError();
  357.                 if (errno != WSAENOTCONN) {
  358.                         rpc_createerr.cf_stat = RPC_SYSTEMERROR;
  359. @@ -1036,7 +1036,7 @@ read_vc(ctp, buf, len)
  360.  
  361.         if (len == 0)
  362.                 return (0);
  363. -       fd.fd = _get_osfhandle(ct->ct_fd);
  364. +       fd.fd = wintirpc_fd2sockethandle(ct->ct_fd);
  365.         fd.events = POLLIN;
  366.         for (;;) {
  367.                 switch (poll(&fd, 1, milliseconds)) {
  368. diff --git a/libtirpc/src/pmap_getmaps.c b/libtirpc/src/pmap_getmaps.c
  369. index daf9e74..1f7d8e2 100644
  370. --- a/libtirpc/src/pmap_getmaps.c
  371. +++ b/libtirpc/src/pmap_getmaps.c
  372. @@ -66,7 +66,7 @@ pmap_getmaps(address)
  373.          struct sockaddr_in *address;
  374.  {
  375.         struct pmaplist *head = NULL;
  376. -       int sock = INVALID_SOCKET;
  377. +       int sock = -1;
  378.         struct timeval minutetimeout;
  379.         CLIENT *client;
  380.  
  381. diff --git a/libtirpc/src/rtime.c b/libtirpc/src/rtime.c
  382. index beaf828..44c5c7b 100644
  383. --- a/libtirpc/src/rtime.c
  384. +++ b/libtirpc/src/rtime.c
  385. @@ -104,7 +104,7 @@ rtime(addrp, timep, timeout)
  386.                 }
  387.                 do {
  388.                         FD_ZERO(&readfds);
  389. -                       FD_SET(_get_osfhandle(s), &readfds);
  390. +                       FD_SET(wintirpc_fd2sockethandle(s), &readfds);
  391.                         res = select(_rpc_dtablesize(), &readfds,
  392.                                      (fd_set *)NULL, (fd_set *)NULL, timeout);
  393.                 } while (res == SOCKET_ERROR && WSAGetLastError() == WSAEINTR);
  394. diff --git a/libtirpc/src/svc.c b/libtirpc/src/svc.c
  395. index 7d8fd1d..22e3746 100644
  396. --- a/libtirpc/src/svc.c
  397. +++ b/libtirpc/src/svc.c
  398. @@ -115,7 +115,7 @@ xprt_register (xprt)
  399.  #ifndef _WIN32
  400.    if (sock < FD_SETSIZE) {
  401.      __svc_xports[sock] = xprt;
  402. -    FD_SET(_get_osfhandle(sock), &svc_fdset);
  403. +    FD_SET(wintirpc_fd2sockethandle(sock), &svc_fdset);
  404.      svc_maxfd = max (svc_maxfd, sock);
  405.    }
  406.  #else
  407. @@ -156,7 +156,7 @@ bool_t dolock;
  408.      rwlock_wrlock (&svc_fd_lock);
  409.    if ((sock < FD_SETSIZE) && (__svc_xports[sock] == xprt)) {
  410.      __svc_xports[sock] = NULL;
  411. -    FD_CLR (_get_osfhandle(sock), &svc_fdset);
  412. +    FD_CLR (wintirpc_fd2sockethandle(sock), &svc_fdset);
  413.      if (sock >= svc_maxfd) {
  414.        for (svc_maxfd--; svc_maxfd >= 0; svc_maxfd--)
  415.          if (__svc_xports[svc_maxfd])
  416. @@ -776,7 +776,7 @@ svc_getreq_poll (pfdp, pollretval)
  417.               rwlock_wrunlock (&svc_fd_lock);
  418.             }
  419.           else
  420. -           svc_getreq_common (wintirpc_handle2fd(p->fd));
  421. +           svc_getreq_common (wintirpc_sockethandle2fd(p->fd));
  422.         }
  423.      }
  424.  }
  425. diff --git a/libtirpc/src/svc_vc.c b/libtirpc/src/svc_vc.c
  426. index 5fa88f5..6ce2748 100644
  427. --- a/libtirpc/src/svc_vc.c
  428. +++ b/libtirpc/src/svc_vc.c
  429. @@ -529,7 +529,7 @@ read_vc(xprtp, buf, len)
  430.  
  431.         do {
  432.  #ifdef _WIN32
  433. -               pollfd.fd = _get_osfhandle(sock);
  434. +               pollfd.fd = wintirpc_fd2sockethandle(sock);
  435.  #else
  436.                 pollfd.fd = sock;
  437.  #endif
  438. diff --git a/libtirpc/src/wintirpc.c b/libtirpc/src/wintirpc.c
  439. index c2cc47a..836c321 100644
  440. --- a/libtirpc/src/wintirpc.c
  441. +++ b/libtirpc/src/wintirpc.c
  442. @@ -141,7 +141,7 @@ struct map_osfhandle_fd handle_fd_map[WINTIRPC_MAX_OSFHANDLE_FD_NHANDLE_VALUE];
  443.  void wintirpc_register_osfhandle_fd(SOCKET handle, int fd)
  444.  {
  445.         assert(handle != 0);
  446. -       assert(handle != SOCKET_ERROR);
  447. +       assert(handle != (SOCKET)SOCKET_ERROR);
  448.         assert(fd < WINTIRPC_MAX_OSFHANDLE_FD_NHANDLE_VALUE);
  449.  
  450.         handle_fd_map[fd].m_fd = fd;
  451. @@ -153,9 +153,9 @@ void wintirpc_unregister_osfhandle(SOCKET handle)
  452.         int i;
  453.  
  454.         assert(handle != 0);
  455. -       assert(handle != SOCKET_ERROR);
  456. +       assert(handle != (SOCKET)SOCKET_ERROR);
  457.  
  458. -       if ((handle == 0) || (handle != SOCKET_ERROR))
  459. +       if ((handle == 0) || (handle != (SOCKET)SOCKET_ERROR))
  460.                 return;
  461.  
  462.         for (i=0 ; i < WINTIRPC_MAX_OSFHANDLE_FD_NHANDLE_VALUE ; i++) {
  463. @@ -186,12 +186,12 @@ void wintirpc_unregister_osf_fd(int fd)
  464.         (void)fprintf(stderr, "wintirpc_unregister_osf_fd: failed\n");
  465.  }
  466.  
  467. -int wintirpc_handle2fd(SOCKET handle)
  468. +int wintirpc_sockethandle2fd(SOCKET handle)
  469.  {
  470.         int i;
  471.  
  472.         assert(handle != 0);
  473. -       assert(handle != SOCKET_ERROR);
  474. +       assert(handle != (SOCKET)SOCKET_ERROR);
  475.  
  476.         for (i=0 ; i < WINTIRPC_MAX_OSFHANDLE_FD_NHANDLE_VALUE ; i++) {
  477.                 if ((handle_fd_map[i].m_s == handle) &&
  478. @@ -200,10 +200,15 @@ int wintirpc_handle2fd(SOCKET handle)
  479.                 }
  480.         }
  481.  
  482. -       (void)fprintf(stderr, "wintirpc_handle2fd: failed\n");
  483. +       (void)fprintf(stderr, "wintirpc_sockethandle2fd: failed\n");
  484.         return -1;
  485.  }
  486.  
  487. +SOCKET wintirpc_fd2sockethandle(int fd)
  488. +{
  489. +       return _get_osfhandle(fd);
  490. +}
  491. +
  492.  int wintirpc_socket(int af, int type, int protocol)
  493.  {
  494.         SOCKET s;
  495. diff --git a/libtirpc/tirpc/rpc/svc.h b/libtirpc/tirpc/rpc/svc.h
  496. index c39c1dc..6f83fd5 100644
  497. --- a/libtirpc/tirpc/rpc/svc.h
  498. +++ b/libtirpc/tirpc/rpc/svc.h
  499. @@ -324,7 +324,7 @@ __END_DECLS
  500.  /*
  501.   * Socket to use on svcxxx_create call to get default socket
  502.   */
  503. -#define        RPC_ANYSOCK     INVALID_SOCKET  /* -1 */
  504. +#define        RPC_ANYSOCK     -1
  505.  #define RPC_ANYFD      RPC_ANYSOCK
  506.  
  507.  /*
  508. diff --git a/libtirpc/tirpc/wintirpc.h b/libtirpc/tirpc/wintirpc.h
  509. index d611b10..878bed0 100644
  510. --- a/libtirpc/tirpc/wintirpc.h
  511. +++ b/libtirpc/tirpc/wintirpc.h
  512. @@ -166,7 +166,8 @@ void wintirpc_warnx(const char *format, ...);
  513.  void wintirpc_register_osfhandle_fd(SOCKET handle, int fd);
  514.  void wintirpc_unregister_osfhandle(SOCKET handle);
  515.  void wintirpc_unregister_osf_fd(int fd);
  516. -int wintirpc_handle2fd(SOCKET handle);
  517. +int wintirpc_sockethandle2fd(SOCKET handle);
  518. +SOCKET wintirpc_fd2sockethandle(int fd);
  519.  
  520.  /* Debugging function */
  521.  void wintirpc_debug(char *fmt, ...);
  522. --
  523. 2.45.1
  524.  
  525. From 01d621b6e8241b15138fbeeb480039aeab07097f Mon Sep 17 00:00:00 2001
  526. From: Roland Mainz <roland.mainz@nrubsig.org>
  527. Date: Sat, 28 Sep 2024 12:24:41 +0200
  528. Subject: [PATCH 04/11] libtirpc: Fix "warning : missing field 'x_control'
  529.  initializer" warnings
  530.  
  531. Fix "warning : missing field 'x_control' initializer" warnings.
  532.  
  533. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  534. ---
  535. libtirpc/src/xdr_mem.c   | 6 ++++--
  536.  libtirpc/src/xdr_rec.c   | 3 ++-
  537.  libtirpc/src/xdr_stdio.c | 3 ++-
  538.  3 files changed, 8 insertions(+), 4 deletions(-)
  539.  
  540. diff --git a/libtirpc/src/xdr_mem.c b/libtirpc/src/xdr_mem.c
  541. index 9a6c063..f2c6f30 100644
  542. --- a/libtirpc/src/xdr_mem.c
  543. +++ b/libtirpc/src/xdr_mem.c
  544. @@ -72,7 +72,8 @@ static const struct   xdr_ops xdrmem_ops_aligned = {
  545.         xdrmem_getpos,
  546.         xdrmem_setpos,
  547.         xdrmem_inline_aligned,
  548. -       xdrmem_destroy
  549. +       xdrmem_destroy,
  550. +       NULL
  551.  };
  552.  
  553.  static const struct    xdr_ops xdrmem_ops_unaligned = {
  554. @@ -83,7 +84,8 @@ static const struct   xdr_ops xdrmem_ops_unaligned = {
  555.         xdrmem_getpos,
  556.         xdrmem_setpos,
  557.         xdrmem_inline_unaligned,
  558. -       xdrmem_destroy
  559. +       xdrmem_destroy,
  560. +       NULL
  561.  };
  562.  
  563.  /*
  564. diff --git a/libtirpc/src/xdr_rec.c b/libtirpc/src/xdr_rec.c
  565. index 19ac5a2..8dd34f8 100644
  566. --- a/libtirpc/src/xdr_rec.c
  567. +++ b/libtirpc/src/xdr_rec.c
  568. @@ -105,7 +105,8 @@ static const struct  xdr_ops xdrrec_ops = {
  569.         xdrrec_getpos,
  570.         xdrrec_setpos,
  571.         xdrrec_inline,
  572. -       xdrrec_destroy
  573. +       xdrrec_destroy,
  574. +       NULL
  575.  };
  576.  
  577.  /*
  578. diff --git a/libtirpc/src/xdr_stdio.c b/libtirpc/src/xdr_stdio.c
  579. index c129b2f..40bddfa 100644
  580. --- a/libtirpc/src/xdr_stdio.c
  581. +++ b/libtirpc/src/xdr_stdio.c
  582. @@ -67,7 +67,8 @@ static const struct xdr_ops   xdrstdio_ops = {
  583.         xdrstdio_getpos,        /* get offset in the stream */
  584.         xdrstdio_setpos,        /* set offset in the stream */
  585.         xdrstdio_inline,        /* prime stream for inline macros */
  586. -       xdrstdio_destroy        /* destroy stream */
  587. +       xdrstdio_destroy,       /* destroy stream */
  588. +       NULL                    /* control */
  589.  };
  590.  
  591.  /*
  592. --
  593. 2.45.1
  594.  
  595. From 98cec921dc8875568e5c7cffd858ef656124aa2b Mon Sep 17 00:00:00 2001
  596. From: Roland Mainz <roland.mainz@nrubsig.org>
  597. Date: Sat, 28 Sep 2024 12:33:38 +0200
  598. Subject: [PATCH 05/11] build.vc19: VC should load Debug/x64 by default on
  599.  startup
  600.  
  601. VC should load Debug/x64 by default on startup
  602.  
  603. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  604. ---
  605. build.vc19/nfs41-client.sln | 4 ++--
  606.  1 file changed, 2 insertions(+), 2 deletions(-)
  607.  
  608. diff --git a/build.vc19/nfs41-client.sln b/build.vc19/nfs41-client.sln
  609. index 5f4e109..b822b28 100644
  610. --- a/build.vc19/nfs41-client.sln
  611. +++ b/build.vc19/nfs41-client.sln
  612. @@ -20,10 +20,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtirpc", "libtirpc\libtir
  613.  EndProject
  614.  Global
  615.         GlobalSection(SolutionConfigurationPlatforms) = preSolution
  616. -               Debug|ARM = Debug|ARM
  617. -               Debug|ARM64 = Debug|ARM64
  618.                 Debug|x64 = Debug|x64
  619.                 Debug|x86 = Debug|x86
  620. +               Debug|ARM = Debug|ARM
  621. +               Debug|ARM64 = Debug|ARM64
  622.                 Release|ARM = Release|ARM
  623.                 Release|ARM64 = Release|ARM64
  624.                 Release|x64 = Release|x64
  625. --
  626. 2.45.1
  627.  
  628. From 60aad049d45b73f750eae32bbaf95ed01d39b1be Mon Sep 17 00:00:00 2001
  629. From: Roland Mainz <roland.mainz@nrubsig.org>
  630. Date: Sat, 28 Sep 2024 12:59:29 +0200
  631. Subject: [PATCH 06/11] daemon: Fix "warning : missing field 'value'
  632.  initializer"
  633.  
  634. Fix "warning : missing field 'value' initializer"
  635.  
  636. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  637. ---
  638. daemon/idmap.c | 52 ++++++++++++++++++++++++++++++++++++++++----------
  639.  1 file changed, 42 insertions(+), 10 deletions(-)
  640.  
  641. diff --git a/daemon/idmap.c b/daemon/idmap.c
  642. index 4c8eda7..dd805e7 100644
  643. --- a/daemon/idmap.c
  644. +++ b/daemon/idmap.c
  645. @@ -1036,8 +1036,13 @@ int nfs41_idmap_name_to_uid(
  646.      const char *username,
  647.      uid_t *uid_out)
  648.  {
  649. -    struct idmap_lookup lookup = { ATTR_USER_NAME,
  650. -        CLASS_USER, TYPE_STR, username_cmp };
  651. +    struct idmap_lookup lookup = {
  652. +        .attr = ATTR_USER_NAME,
  653. +        .klass = CLASS_USER,
  654. +        .type = TYPE_STR,
  655. +        .compare = username_cmp,
  656. +        .value = NULL
  657. +    };
  658.      struct idmap_user user;
  659.      int status;
  660.  
  661. @@ -1066,8 +1071,13 @@ int nfs41_idmap_name_to_ids(
  662.      uid_t *uid_out,
  663.      gid_t *gid_out)
  664.  {
  665. -    struct idmap_lookup lookup = { ATTR_USER_NAME,
  666. -        CLASS_USER, TYPE_STR, username_cmp };
  667. +    struct idmap_lookup lookup = {
  668. +        .attr = ATTR_USER_NAME,
  669. +        .klass = CLASS_USER,
  670. +        .type = TYPE_STR,
  671. +        .compare = username_cmp,
  672. +        .value = NULL
  673. +    };
  674.      struct idmap_user user;
  675.      int status;
  676.  
  677. @@ -1109,7 +1119,13 @@ int nfs41_idmap_uid_to_name(
  678.      char *name,
  679.      size_t len)
  680.  {
  681. -    struct idmap_lookup lookup = { ATTR_UID, CLASS_USER, TYPE_INT, uid_cmp };
  682. +    struct idmap_lookup lookup = {
  683. +        .attr = ATTR_UID,
  684. +        .klass = CLASS_USER,
  685. +        .type = TYPE_INT,
  686. +        .compare = uid_cmp,
  687. +        .value = NULL
  688. +    };
  689.      struct idmap_user user;
  690.      int status;
  691.  
  692. @@ -1153,8 +1169,13 @@ int nfs41_idmap_principal_to_ids(
  693.      uid_t *uid_out,
  694.      gid_t *gid_out)
  695.  {
  696. -    struct idmap_lookup lookup = { ATTR_PRINCIPAL,
  697. -        CLASS_USER, TYPE_STR, principal_cmp };
  698. +    struct idmap_lookup lookup = {
  699. +        .attr = ATTR_PRINCIPAL,
  700. +        .klass = CLASS_USER,
  701. +        .type = TYPE_STR,
  702. +        .compare = principal_cmp,
  703. +        .value = NULL
  704. +    };
  705.      struct idmap_user user;
  706.      int status;
  707.  
  708. @@ -1192,8 +1213,13 @@ int nfs41_idmap_group_to_gid(
  709.      const char *name,
  710.      gid_t *gid_out)
  711.  {
  712. -    struct idmap_lookup lookup = { ATTR_GROUP_NAME,
  713. -        CLASS_GROUP, TYPE_STR, group_cmp };
  714. +    struct idmap_lookup lookup = {
  715. +        .attr = ATTR_GROUP_NAME,
  716. +        .klass = CLASS_GROUP,
  717. +        .type = TYPE_STR,
  718. +        .compare = group_cmp,
  719. +        .value = NULL
  720. +    };
  721.      struct idmap_group group;
  722.      int status;
  723.  
  724. @@ -1231,7 +1257,13 @@ int nfs41_idmap_gid_to_group(
  725.      char *name,
  726.      size_t len)
  727.  {
  728. -    struct idmap_lookup lookup = { ATTR_GID, CLASS_GROUP, TYPE_INT, gid_cmp };
  729. +    struct idmap_lookup lookup = {
  730. +        .attr = ATTR_GID,
  731. +        .klass = CLASS_GROUP,
  732. +        .type = TYPE_INT,
  733. +        .compare = gid_cmp,
  734. +        .value = NULL
  735. +    };
  736.      struct idmap_group group;
  737.      int status;
  738.  
  739. --
  740. 2.45.1
  741.  
  742. From 38acab747bdccb940e4bc848504d306311e74239 Mon Sep 17 00:00:00 2001
  743. From: Roland Mainz <roland.mainz@nrubsig.org>
  744. Date: Sat, 28 Sep 2024 13:20:31 +0200
  745. Subject: [PATCH 07/11] daemon: Fix "warning : missing field 'x_ops'
  746.  initializer"
  747.  
  748. Fix "warning : missing field 'x_ops' initializer"
  749.  
  750. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  751. ---
  752. daemon/nfs41_xdr.c | 2 +-
  753.  1 file changed, 1 insertion(+), 1 deletion(-)
  754.  
  755. diff --git a/daemon/nfs41_xdr.c b/daemon/nfs41_xdr.c
  756. index cadecad..78f7657 100644
  757. --- a/daemon/nfs41_xdr.c
  758. +++ b/daemon/nfs41_xdr.c
  759. @@ -335,7 +335,7 @@ static bool_t xdr_nfsacl41(
  760.  
  761.  void nfsacl41_free(nfsacl41 *acl)
  762.  {
  763. -    XDR xdr = { XDR_FREE };
  764. +    XDR xdr = { .x_op = XDR_FREE };
  765.      xdr_nfsacl41(&xdr, acl);
  766.  }
  767.  
  768. --
  769. 2.45.1
  770.  
  771. From 6899c631e12083e5f25eb92b158fd7831160c4a1 Mon Sep 17 00:00:00 2001
  772. From: Roland Mainz <roland.mainz@nrubsig.org>
  773. Date: Sat, 28 Sep 2024 13:39:48 +0200
  774. Subject: [PATCH 08/11] daemon: Add error messages to |switch()| cases which
  775.  should never happen
  776.  
  777. Add error messages to |switch()| cases which should never happen.
  778.  
  779. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  780. ---
  781. daemon/callback_xdr.c | 4 ++++
  782.  daemon/daemon_debug.c | 1 +
  783.  daemon/nfs41_xdr.c    | 8 ++++++++
  784.  3 files changed, 13 insertions(+)
  785.  
  786. diff --git a/daemon/callback_xdr.c b/daemon/callback_xdr.c
  787. index 6703fc0..0aa47f4 100644
  788. --- a/daemon/callback_xdr.c
  789. +++ b/daemon/callback_xdr.c
  790. @@ -501,6 +501,10 @@ static bool_t op_cb_notify_deviceid_args(XDR *xdr, struct cb_notify_deviceid_arg
  791.          free(args->change_list);
  792.      case XDR_ENCODE:
  793.          return TRUE;
  794. +    default:
  795. +        eprintf("op_cb_notify_deviceid_args: Unexpected xdr->x_op=%d\n",
  796. +            (int)xdr->x_op);
  797. +        break;
  798.      }
  799.  
  800.      /* count the number of device changes */
  801. diff --git a/daemon/daemon_debug.c b/daemon/daemon_debug.c
  802. index f7e935c..fb155ed 100644
  803. --- a/daemon/daemon_debug.c
  804. +++ b/daemon/daemon_debug.c
  805. @@ -438,6 +438,7 @@ const char* opcode2string(nfs41_opcodes opcode)
  806.          NFSOPCODE_TO_STRLITERAL(NFS41_VOLUME_QUERY)
  807.          NFSOPCODE_TO_STRLITERAL(NFS41_ACL_QUERY)
  808.          NFSOPCODE_TO_STRLITERAL(NFS41_ACL_SET)
  809. +        default: break;
  810.      }
  811.      return "<unknown NFS41 opcode>";
  812.  }
  813. diff --git a/daemon/nfs41_xdr.c b/daemon/nfs41_xdr.c
  814. index 78f7657..ad9305c 100644
  815. --- a/daemon/nfs41_xdr.c
  816. +++ b/daemon/nfs41_xdr.c
  817. @@ -3214,6 +3214,10 @@ static bool_t decode_op_getdeviceinfo(
  818.              return xdr_u_int32_t(xdr, &ignored);
  819.          }
  820.          break;
  821. +    default:
  822. +        eprintf("decode_op_getdeviceinfo: Unexpected res->status=%d\n",
  823. +            (int)res->status);
  824. +        break;
  825.      }
  826.      return TRUE;
  827.  }
  828. @@ -3474,6 +3478,10 @@ static bool_t decode_op_layoutget(
  829.          return decode_layout_res_ok(xdr, res->u.res_ok);
  830.      case NFS4ERR_LAYOUTTRYLATER:
  831.          return xdr_bool(xdr, &res->u.will_signal_layout_avail);
  832. +    default:
  833. +        eprintf("decode_op_layoutget: Unexpected res->status=%d\n",
  834. +            (int)res->status);
  835. +        break;
  836.      }
  837.      return TRUE;
  838.  }
  839. --
  840. 2.45.1
  841.  
  842. From 03aa9d3252edde7b191ff06b202f601b9d0fc138 Mon Sep 17 00:00:00 2001
  843. From: Roland Mainz <roland.mainz@nrubsig.org>
  844. Date: Sat, 28 Sep 2024 13:51:57 +0200
  845. Subject: [PATCH 09/11] daemon: Fix "warning : implicit conversion from
  846.  enumeration type 'enum secinfo_no_name_type' to different enumeration type
  847.  'enum secinfo_noname_type"
  848.  
  849. Fix "warning : implicit conversion from enumeration type
  850. 'enum secinfo_no_name_type' to different enumeration type
  851. 'enum secinfo_noname_type", which is actually just a spelling
  852. mistake s/noname/no_name/
  853.  
  854. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  855. ---
  856. daemon/nfs41_ops.c |  6 +++---
  857.  daemon/nfs41_ops.h | 10 +++++-----
  858.  daemon/nfs41_xdr.c |  6 +++---
  859.  3 files changed, 11 insertions(+), 11 deletions(-)
  860.  
  861. diff --git a/daemon/nfs41_ops.c b/daemon/nfs41_ops.c
  862. index 5ef7e93..9aae94a 100644
  863. --- a/daemon/nfs41_ops.c
  864. +++ b/daemon/nfs41_ops.c
  865. @@ -1881,7 +1881,7 @@ int nfs41_secinfo(
  866.      nfs41_putfh_args putfh_args;
  867.      nfs41_putfh_res putfh_res;
  868.      nfs41_secinfo_args secinfo_args;
  869. -    nfs41_secinfo_noname_res secinfo_res;
  870. +    nfs41_secinfo_no_name_res secinfo_res;
  871.  
  872.      compound_init(&compound, argops, resops, "secinfo");
  873.  
  874. @@ -1928,8 +1928,8 @@ int nfs41_secinfo_noname(
  875.      nfs41_sequence_res sequence_res;
  876.      nfs41_putfh_args putfh_args;
  877.      nfs41_putfh_res putfh_res;
  878. -    nfs41_secinfo_noname_args noname_args;
  879. -    nfs41_secinfo_noname_res noname_res;
  880. +    nfs41_secinfo_no_name_args noname_args;
  881. +    nfs41_secinfo_no_name_res noname_res;
  882.  
  883.      compound_init(&compound, argops, resops, "secinfo_no_name");
  884.  
  885. diff --git a/daemon/nfs41_ops.h b/daemon/nfs41_ops.h
  886. index eec02f8..594eb34 100644
  887. --- a/daemon/nfs41_ops.h
  888. +++ b/daemon/nfs41_ops.h
  889. @@ -892,16 +892,16 @@ enum secinfo_no_name_type {
  890.      SECINFO_STYLE4_PARENT = 1
  891.  };
  892.  
  893. -typedef struct __nfs41_secinfo_noname_args {
  894. -    enum secinfo_noname_type type;
  895. -} nfs41_secinfo_noname_args;
  896. +typedef struct __nfs41_secinfo_no_name_args {
  897. +    enum secinfo_no_name_type type;
  898. +} nfs41_secinfo_no_name_args;
  899.  
  900. -typedef struct __nfs41_secinfo_noname_res {
  901. +typedef struct __nfs41_secinfo_no_name_res {
  902.      uint32_t                status;
  903.      /* case NFS4_OK: */
  904.      nfs41_secinfo_info      *secinfo;
  905.      uint32_t                count;
  906. -} nfs41_secinfo_noname_res;
  907. +} nfs41_secinfo_no_name_res;
  908.  
  909.  /* LAYOUTGET */
  910.  typedef struct __pnfs_layoutget_args {
  911. diff --git a/daemon/nfs41_xdr.c b/daemon/nfs41_xdr.c
  912. index ad9305c..d626615 100644
  913. --- a/daemon/nfs41_xdr.c
  914. +++ b/daemon/nfs41_xdr.c
  915. @@ -2956,7 +2956,7 @@ static bool_t encode_op_secinfo_noname(
  916.      XDR *xdr,
  917.      nfs_argop4 *argop)
  918.  {
  919. -    nfs41_secinfo_noname_args *args = (nfs41_secinfo_noname_args *)argop->arg;
  920. +    nfs41_secinfo_no_name_args *args = (nfs41_secinfo_no_name_args *)argop->arg;
  921.  
  922.      if (unexpected_op(argop->op, OP_SECINFO_NO_NAME))
  923.          return FALSE;
  924. @@ -2971,7 +2971,7 @@ static bool_t decode_op_secinfo_noname(
  925.      XDR *xdr,
  926.      nfs_resop4 *resop)
  927.  {
  928. -    nfs41_secinfo_noname_res *res = (nfs41_secinfo_noname_res *)resop->res;
  929. +    nfs41_secinfo_no_name_res *res = (nfs41_secinfo_no_name_res *)resop->res;
  930.      nfs41_secinfo_info *secinfo = res->secinfo;
  931.      if (unexpected_op(resop->op, OP_SECINFO_NO_NAME))
  932.          return FALSE;
  933. @@ -3008,7 +3008,7 @@ static bool_t decode_op_secinfo(
  934.      XDR *xdr,
  935.      nfs_resop4 *resop)
  936.  {
  937. -    nfs41_secinfo_noname_res *res = (nfs41_secinfo_noname_res *)resop->res;
  938. +    nfs41_secinfo_no_name_res *res = (nfs41_secinfo_no_name_res *)resop->res;
  939.      nfs41_secinfo_info *secinfo = res->secinfo;
  940.  
  941.      if (unexpected_op(resop->op, OP_SECINFO))
  942. --
  943. 2.45.1
  944.  
  945. From 5d066011bd36659981d5570dfc8b3a0764540287 Mon Sep 17 00:00:00 2001
  946. From: Roland Mainz <roland.mainz@nrubsig.org>
  947. Date: Sat, 28 Sep 2024 14:16:10 +0200
  948. Subject: [PATCH 10/11] cygwin: README.bintarball.txt: Admin should create
  949.  subdir for install file download
  950.  
  951. README.bintarball.txt: Admin should create subdir for install file
  952. download and installation.
  953.  
  954. Reported-by: Martin Wege <martin.l.wege@gmail.com>
  955. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  956. ---
  957. cygwin/README.bintarball.txt | 14 ++++++++++----
  958.  1 file changed, 10 insertions(+), 4 deletions(-)
  959.  
  960. diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt
  961. index 52b99a6..92f32f3 100644
  962. --- a/cygwin/README.bintarball.txt
  963. +++ b/cygwin/README.bintarball.txt
  964. @@ -146,9 +146,12 @@ echo %PROCESSOR_ARCHITECTURE%
  965.  # ---- snip ----
  966.  # Install Cygwin 64bit on Windows 64bit with packages required by "ms-nfs41-client"
  967.  # (Windows NFSv4.1 client):
  968. -# 1. Get installer from https://cygwin.com/setup-x86_64.exe
  969. +# 1. Create subdir
  970. +mkdir download
  971. +cd download
  972. +# 2. Get installer from https://cygwin.com/setup-x86_64.exe
  973.  curl --remote-name "https://www.cygwin.com/setup-x86_64.exe"
  974. -# 2. Run installer with these arguments:
  975. +# 3. Run installer with these arguments:
  976.  setup-x86_64.exe -q --site "https://mirrors.kernel.org/sourceware/cygwin" -P cygwin,cygwin-devel,cygrunsrv,cygutils,cygutils-extra,bash,bzip2,coreutils,getent,gdb,grep,hostname,less,libiconv,libiconv2,pax,pbzip2,procps-ng,sed,tar,time,util-linux,wget,libnfs-utils,make,bmake,git,dos2unix,unzip
  977.  # ---- snip ----
  978.  
  979. @@ -157,9 +160,12 @@ setup-x86_64.exe -q --site "https://mirrors.kernel.org/sourceware/cygwin" -P cyg
  980.  # ---- snip ----
  981.  # Install Cygwin 32bit on Windows 32bit with packages required by "ms-nfs41-client"
  982.  # (Windows NFSv4.1 client):
  983. -# 1. Get installer from https://www.cygwin.com/setup-x86.exe
  984. +# 1. Create subdir
  985. +mkdir download
  986. +cd download
  987. +# 2. Get installer from https://www.cygwin.com/setup-x86.exe
  988.  curl --remote-name "https://www.cygwin.com/setup-x86.exe"
  989. -# 2. Run installer with these arguments:
  990. +# 3. Run installer with these arguments:
  991.  setup-x86.exe --allow-unsupported-windows -q --no-verify --site "http://ctm.crouchingtigerhiddenfruitbat.org/pub/cygwin/circa/2022/11/23/063457" -P cygwin,cygwin-devel,cygrunsrv,cygutils,cygutils-extra,bash,bzip2,coreutils,getent,gdb,grep,hostname,less,libiconv,libiconv2,pax,pbzip2,procps-ng,sed,tar,time,util-linux,wget,libnfs-utils,make,bmake,git,dos2unix,unzip
  992.  # ---- snip ----
  993.  
  994. --
  995. 2.45.1
  996.  
  997. From 7d2934aa11a2aa2ead66ef4d3c0340544d86ceb5 Mon Sep 17 00:00:00 2001
  998. From: Roland Mainz <roland.mainz@nrubsig.org>
  999. Date: Sat, 28 Sep 2024 14:44:44 +0200
  1000. Subject: [PATCH 11/11] daemon: Run workers with
  1001.  |THREAD_PRIORITY_TIME_CRITICAL| to avoid prio-inversion
  1002.  
  1003. The nfsd daemon worker threads should run with
  1004. |THREAD_PRIORITY_TIME_CRITICAL| priority to avoid priority inversion
  1005. issues if a high-priority process using the NFSv4 filesystem steals
  1006. CPU time from the NFSv4 filesystem daemon on very busy systems.
  1007. This is considered not a big problem as worker threads
  1008. spend most of their time waiting for the network or kernel
  1009. threads anyway.
  1010.  
  1011. Fixes build time issues with Cygwin/gcc parallel builds.
  1012.  
  1013. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1014. ---
  1015. daemon/nfs41_daemon.c | 13 +++++++++++++
  1016.  1 file changed, 13 insertions(+)
  1017.  
  1018. diff --git a/daemon/nfs41_daemon.c b/daemon/nfs41_daemon.c
  1019. index a902852..ede4c58 100644
  1020. --- a/daemon/nfs41_daemon.c
  1021. +++ b/daemon/nfs41_daemon.c
  1022. @@ -136,6 +136,19 @@ static unsigned int nfsd_worker_thread_main(void *args)
  1023.      DWORD inbuf_len = UPCALL_BUF_SIZE, outbuf_len;
  1024.      nfs41_upcall upcall;
  1025.  
  1026. +    /*
  1027. +     * Set |THREAD_PRIORITY_TIME_CRITICAL| to avoid that the daemon
  1028. +     * gets stomped by other processes, which might lead to some
  1029. +     * kind of priority inversion.
  1030. +     */
  1031. +    if (SetThreadPriority(GetCurrentThread(),
  1032. +        THREAD_PRIORITY_TIME_CRITICAL)) {
  1033. +        DPRINTF(1, ("Running as THREAD_PRIORITY_TIME_CRITICAL\n"));
  1034. +    }
  1035. +    else {
  1036. +        eprintf("Failed set THREAD_PRIORITY_TIME_CRITICAL\n");
  1037. +    }
  1038. +
  1039.      pipe = CreateFileA(NFS41_USER_DEVICE_NAME_A, GENERIC_READ | GENERIC_WRITE,
  1040.          FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
  1041.          0, NULL);
  1042. --
  1043. 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