pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Win32 flag |FILE_ATTRIBUTE_SPARSE_FILE| by default, volume query+winfsinfo+debug+misc, 2025-01-28
Posted by Anonymous on Tue 28th Jan 2025 15:50
raw | new post

  1. From d9f7059595896341dbde2bffbabcc645c7e1b308 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Tue, 28 Jan 2025 11:26:26 +0100
  4. Subject: [PATCH 1/7] build.v19: Remove ARM 32bit support
  5.  
  6. Remove ARM 32bit support, because:
  7. - Visual Studio 2019 cannot build kernel modules for ARM/32bit kernels
  8.   for Win10/Desktop targets
  9. - Windows 10/Desktop does not support ARM/32bit
  10. - Cygwin (which is required by our idmapper) does not run on ARM/32bit
  11. - We have no test machine for ARM/32bit
  12.  
  13. Support can be restored if we somehow magically get a test machine
  14. and users who need it.
  15.  
  16. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  17. ---
  18. build.vc19/nfs41-client.sln                  | 28 ----------
  19.  build.vc19/nfs41_driver/nfs41_driver.vcxproj | 56 --------------------
  20.  2 files changed, 84 deletions(-)
  21.  
  22. diff --git a/build.vc19/nfs41-client.sln b/build.vc19/nfs41-client.sln
  23. index 15dea16..df40a34 100644
  24. --- a/build.vc19/nfs41-client.sln
  25. +++ b/build.vc19/nfs41-client.sln
  26. @@ -22,9 +22,7 @@ Global
  27.         GlobalSection(SolutionConfigurationPlatforms) = preSolution
  28.                 Debug|x64 = Debug|x64
  29.                 Debug|x86 = Debug|x86
  30. -               Debug|ARM = Debug|ARM
  31.                 Debug|ARM64 = Debug|ARM64
  32. -               Release|ARM = Release|ARM
  33.                 Release|ARM64 = Release|ARM64
  34.                 Release|x64 = Release|x64
  35.                 Release|x86 = Release|x86
  36. @@ -36,16 +34,12 @@ Global
  37.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Debug|x86.Build.0 = Debug|Win32
  38.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Debug|ARM64.ActiveCfg = Debug|ARM64
  39.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Debug|ARM64.Build.0 = Debug|ARM64
  40. -               {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Debug|ARM.ActiveCfg = Debug|ARM
  41. -               {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Debug|ARM.Build.0 = Debug|ARM
  42.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Release|x64.ActiveCfg = Release|x64
  43.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Release|x64.Build.0 = Release|x64
  44.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Release|x86.ActiveCfg = Release|Win32
  45.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Release|x86.Build.0 = Release|Win32
  46.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Release|ARM64.ActiveCfg = Release|ARM64
  47.                 {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Release|ARM64.Build.0 = Release|ARM64
  48. -               {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Release|ARM.ActiveCfg = Release|ARM
  49. -               {D99CCE56-FF7D-44D3-8E75-EB6D8F47CFA1}.Release|ARM.Build.0 = Release|ARM
  50.                 {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Debug|x64.ActiveCfg = Debug|x64
  51.                 {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Debug|x64.Build.0 = Debug|x64
  52.                 {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Debug|x86.ActiveCfg = Debug|Win32
  53. @@ -56,12 +50,8 @@ Global
  54.                 {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Release|x86.Build.0 = Release|Win32
  55.                 {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Debug|ARM64.ActiveCfg = Debug|ARM64
  56.                 {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Debug|ARM64.Build.0 = Debug|ARM64
  57. -               {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Debug|ARM.ActiveCfg = Debug|ARM
  58. -               {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Debug|ARM.Build.0 = Debug|ARM
  59.                 {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Release|ARM64.ActiveCfg = Release|ARM64
  60.                 {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Release|ARM64.Build.0 = Release|ARM64
  61. -               {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Release|ARM.ActiveCfg = Release|ARM
  62. -               {896D812D-B4AC-4661-A9ED-7DE94BB68365}.Release|ARM.Build.0 = Release|ARM
  63.                 {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Debug|x64.ActiveCfg = Debug|x64
  64.                 {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Debug|x64.Build.0 = Debug|x64
  65.                 {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Debug|x86.ActiveCfg = Debug|Win32
  66. @@ -72,12 +62,8 @@ Global
  67.                 {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Release|x86.Build.0 = Release|Win32
  68.                 {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Debug|ARM64.ActiveCfg = Debug|ARM64
  69.                 {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Debug|ARM64.Build.0 = Debug|ARM64
  70. -               {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Debug|ARM.ActiveCfg = Debug|ARM
  71. -               {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Debug|ARM.Build.0 = Debug|ARM
  72.                 {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Release|ARM64.ActiveCfg = Release|ARM64
  73.                 {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Release|ARM64.Build.0 = Release|ARM64
  74. -               {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Release|ARM.ActiveCfg = Release|ARM
  75. -               {833F4171-5B96-4BB0-8D9D-BB926ECA8976}.Release|ARM.Build.0 = Release|ARM
  76.                 {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Debug|x64.ActiveCfg = Debug|x64
  77.                 {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Debug|x64.Build.0 = Debug|x64
  78.                 {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Debug|x86.ActiveCfg = Debug|Win32
  79. @@ -90,14 +76,8 @@ Global
  80.                 {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Release|x86.Deploy.0 = Release|Win32
  81.                 {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Debug|ARM64.ActiveCfg = Debug|ARM64
  82.                 {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Debug|ARM64.Build.0 = Debug|ARM64
  83. -               {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Debug|ARM.ActiveCfg = Debug|ARM
  84. -               {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Debug|ARM.Build.0 = Debug|ARM
  85. -               {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Debug|ARM.Deploy.0 = Debug|ARM
  86.                 {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Release|ARM64.ActiveCfg = Release|ARM64
  87.                 {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Release|ARM64.Build.0 = Release|ARM64
  88. -               {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Release|ARM.ActiveCfg = Release|ARM
  89. -               {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Release|ARM.Build.0 = Release|ARM
  90. -               {78E2A6FE-05E7-40F8-AE1E-29BC3C307859}.Release|ARM.Deploy.0 = Release|ARM
  91.                 {FAE57101-F0EE-46CB-986D-E19A796693F7}.Debug|x64.ActiveCfg = Debug|x64
  92.                 {FAE57101-F0EE-46CB-986D-E19A796693F7}.Debug|x64.Build.0 = Debug|x64
  93.                 {FAE57101-F0EE-46CB-986D-E19A796693F7}.Debug|x86.ActiveCfg = Debug|Win32
  94. @@ -108,12 +88,8 @@ Global
  95.                 {FAE57101-F0EE-46CB-986D-E19A796693F7}.Release|x86.Build.0 = Release|Win32
  96.                 {FAE57101-F0EE-46CB-986D-E19A796693F7}.Debug|ARM64.ActiveCfg = Debug|ARM64
  97.                 {FAE57101-F0EE-46CB-986D-E19A796693F7}.Debug|ARM64.Build.0 = Debug|ARM64
  98. -               {FAE57101-F0EE-46CB-986D-E19A796693F7}.Debug|ARM.ActiveCfg = Debug|ARM
  99. -               {FAE57101-F0EE-46CB-986D-E19A796693F7}.Debug|ARM.Build.0 = Debug|ARM
  100.                 {FAE57101-F0EE-46CB-986D-E19A796693F7}.Release|ARM64.ActiveCfg = Release|ARM64
  101.                 {FAE57101-F0EE-46CB-986D-E19A796693F7}.Release|ARM64.Build.0 = Release|ARM64
  102. -               {FAE57101-F0EE-46CB-986D-E19A796693F7}.Release|ARM.ActiveCfg = Release|ARM
  103. -               {FAE57101-F0EE-46CB-986D-E19A796693F7}.Release|ARM.Build.0 = Release|ARM
  104.                 {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Debug|x64.ActiveCfg = Debug|x64
  105.                 {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Debug|x64.Build.0 = Debug|x64
  106.                 {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Debug|x86.ActiveCfg = Debug|Win32
  107. @@ -124,12 +100,8 @@ Global
  108.                 {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Release|x86.Build.0 = Release|Win32
  109.                 {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Debug|ARM64.ActiveCfg = Debug|ARM64
  110.                 {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Debug|ARM64.Build.0 = Debug|ARM64
  111. -               {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Debug|ARM.ActiveCfg = Debug|ARM
  112. -               {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Debug|ARM.Build.0 = Debug|ARM
  113.                 {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Release|ARM64.ActiveCfg = Release|ARM64
  114.                 {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Release|ARM64.Build.0 = Release|ARM64
  115. -               {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Release|ARM.ActiveCfg = Release|ARM
  116. -               {3B0A10FB-7CF3-4A91-9767-3BA6FEDE7FFE}.Release|ARM.Build.0 = Release|ARM
  117.  
  118.         EndGlobalSection
  119.         GlobalSection(SolutionProperties) = preSolution
  120. diff --git a/build.vc19/nfs41_driver/nfs41_driver.vcxproj b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  121. index 0affe23..fd46b2e 100644
  122. --- a/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  123. +++ b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  124. @@ -17,14 +17,6 @@
  125.        <Configuration>Release</Configuration>
  126.        <Platform>x64</Platform>
  127.      </ProjectConfiguration>
  128. -    <ProjectConfiguration Include="Debug|ARM">
  129. -      <Configuration>Debug</Configuration>
  130. -      <Platform>ARM</Platform>
  131. -    </ProjectConfiguration>
  132. -    <ProjectConfiguration Include="Release|ARM">
  133. -      <Configuration>Release</Configuration>
  134. -      <Platform>ARM</Platform>
  135. -    </ProjectConfiguration>
  136.      <ProjectConfiguration Include="Debug|ARM64">
  137.        <Configuration>Debug</Configuration>
  138.        <Platform>ARM64</Platform>
  139. @@ -73,20 +65,6 @@
  140.      <ConfigurationType>Driver</ConfigurationType>
  141.      <DriverType>WDM</DriverType>
  142.    </PropertyGroup>
  143. -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
  144. -    <TargetVersion>Windows10</TargetVersion>
  145. -    <UseDebugLibraries>true</UseDebugLibraries>
  146. -    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
  147. -    <ConfigurationType>Driver</ConfigurationType>
  148. -    <DriverType>WDM</DriverType>
  149. -  </PropertyGroup>
  150. -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
  151. -    <TargetVersion>Windows10</TargetVersion>
  152. -    <UseDebugLibraries>false</UseDebugLibraries>
  153. -    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
  154. -    <ConfigurationType>Driver</ConfigurationType>
  155. -    <DriverType>WDM</DriverType>
  156. -  </PropertyGroup>
  157.    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
  158.      <TargetVersion>Windows10</TargetVersion>
  159.      <UseDebugLibraries>true</UseDebugLibraries>
  160. @@ -121,12 +99,6 @@
  161.    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  162.      <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
  163.    </PropertyGroup>
  164. -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
  165. -    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
  166. -  </PropertyGroup>
  167. -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
  168. -    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
  169. -  </PropertyGroup>
  170.    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
  171.      <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
  172.    </PropertyGroup>
  173. @@ -195,34 +167,6 @@
  174.        <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
  175.      </DriverSign>
  176.    </ItemDefinitionGroup>
  177. -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
  178. -    <ClCompile>
  179. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  180. -      <WarningLevel>Level4</WarningLevel>
  181. -      <Optimization>Disabled</Optimization>
  182. -      <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  183. -      <LanguageStandard_C>stdc17</LanguageStandard_C>
  184. -      <StringPooling>true</StringPooling>
  185. -      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  186. -    </ClCompile>
  187. -    <Link>
  188. -      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  189. -    </Link>
  190. -  </ItemDefinitionGroup>
  191. -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
  192. -    <ClCompile>
  193. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  194. -      <WarningLevel>Level4</WarningLevel>
  195. -      <Optimization>MaxSpeed</Optimization>
  196. -      <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  197. -      <LanguageStandard_C>stdc17</LanguageStandard_C>
  198. -      <StringPooling>true</StringPooling>
  199. -      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  200. -    </ClCompile>
  201. -    <Link>
  202. -      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  203. -    </Link>
  204. -  </ItemDefinitionGroup>
  205.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  206.      <ClCompile>
  207.        <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  208. --
  209. 2.45.1
  210.  
  211. From 0286fd087048fb3b6ab1da3a86f9b35d93d0518d Mon Sep 17 00:00:00 2001
  212. From: Roland Mainz <roland.mainz@nrubsig.org>
  213. Date: Tue, 28 Jan 2025 11:35:09 +0100
  214. Subject: [PATCH 2/7] build.vc19: Set OmitFramePointers=false for accurate
  215.  drmemory stack traces
  216.  
  217. Set OmitFramePointers=false for accurate drmemory stack traces
  218.  
  219. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  220. ---
  221. build.vc19/libtirpc/libtirpc.vcxproj | 2 ++
  222.  build.vc19/nfsd/nfsd.vcxproj         | 2 ++
  223.  2 files changed, 4 insertions(+)
  224.  
  225. diff --git a/build.vc19/libtirpc/libtirpc.vcxproj b/build.vc19/libtirpc/libtirpc.vcxproj
  226. index 2da4efa..3e79ad7 100644
  227. --- a/build.vc19/libtirpc/libtirpc.vcxproj
  228. +++ b/build.vc19/libtirpc/libtirpc.vcxproj
  229. @@ -152,6 +152,7 @@
  230.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  231.        <AdditionalOptions>/wd4100 /wd4131 /wd4389</AdditionalOptions>
  232.        <SupportJustMyCode>false</SupportJustMyCode>
  233. +      <OmitFramePointers>false</OmitFramePointers>
  234.      </ClCompile>
  235.      <Link>
  236.        <SubSystem>Windows</SubSystem>
  237. @@ -223,6 +224,7 @@
  238.        <BufferSecurityCheck>false</BufferSecurityCheck>
  239.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  240.        <AdditionalOptions>/wd4100 /wd4131 /wd4389</AdditionalOptions>
  241. +      <OmitFramePointers>false</OmitFramePointers>
  242.      </ClCompile>
  243.      <Link>
  244.        <SubSystem>Windows</SubSystem>
  245. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  246. index 5551617..51bbba0 100644
  247. --- a/build.vc19/nfsd/nfsd.vcxproj
  248. +++ b/build.vc19/nfsd/nfsd.vcxproj
  249. @@ -157,6 +157,7 @@
  250.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  251.        <AdditionalOptions>/wd4100</AdditionalOptions>
  252.        <SupportJustMyCode>false</SupportJustMyCode>
  253. +      <OmitFramePointers>false</OmitFramePointers>
  254.      </ClCompile>
  255.      <Link>
  256.        <SubSystem>Console</SubSystem>
  257. @@ -225,6 +226,7 @@
  258.        <StringPooling>true</StringPooling>
  259.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  260.        <AdditionalOptions>/wd4100</AdditionalOptions>
  261. +      <OmitFramePointers>false</OmitFramePointers>
  262.      </ClCompile>
  263.      <Link>
  264.        <SubSystem>Console</SubSystem>
  265. --
  266. 2.45.1
  267.  
  268. From 33fa4a2b642702f9f93182e92bcc4c63ac4da202 Mon Sep 17 00:00:00 2001
  269. From: Roland Mainz <roland.mainz@nrubsig.org>
  270. Date: Tue, 28 Jan 2025 11:47:25 +0100
  271. Subject: [PATCH 3/7] build.vc19: Sync "Release" build options across all
  272.  platform
  273.  
  274. Sync "Release" build options across all platform, e.g. use this on all
  275. "Release" builds:
  276. Optimization=MaxSpeed
  277. IntrinsicFunctions=true
  278. WholeProgramOptimization=true
  279.  
  280. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  281. ---
  282. build.vc19/nfsd/nfsd.vcxproj | 4 +++-
  283.  1 file changed, 3 insertions(+), 1 deletion(-)
  284.  
  285. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  286. index 51bbba0..50fd24b 100644
  287. --- a/build.vc19/nfsd/nfsd.vcxproj
  288. +++ b/build.vc19/nfsd/nfsd.vcxproj
  289. @@ -170,7 +170,7 @@
  290.        <PrecompiledHeader>
  291.        </PrecompiledHeader>
  292.        <WarningLevel>Level4</WarningLevel>
  293. -      <Optimization>Disabled</Optimization>
  294. +      <Optimization>MaxSpeed</Optimization>
  295.        <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>
  296.        <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  297.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  298. @@ -180,6 +180,8 @@
  299.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  300.        <AdditionalOptions>/wd4100</AdditionalOptions>
  301.        <SupportJustMyCode>false</SupportJustMyCode>
  302. +      <IntrinsicFunctions>true</IntrinsicFunctions>
  303. +      <WholeProgramOptimization>true</WholeProgramOptimization>
  304.      </ClCompile>
  305.      <Link>
  306.        <SubSystem>Console</SubSystem>
  307. --
  308. 2.45.1
  309.  
  310. From f3e4910c8b25cf9d49d9e659073dd443464cfead Mon Sep 17 00:00:00 2001
  311. From: Roland Mainz <roland.mainz@nrubsig.org>
  312. Date: Tue, 28 Jan 2025 14:50:13 +0100
  313. Subject: [PATCH 4/7] daemon,include,sys: Add support for volume query
  314.  |FileFsSectorSizeInformation|
  315.  
  316. Add support for volume query |FileFsSectorSizeInformation|,
  317. because |FILE_FS_SECTOR_SIZE_INFORMATION.Flags| field bit
  318. |SSINFO_FLAGS_NO_SEEK_PENALTY| is required by Cygwin, MSYS2, mingw
  319. etc for sparse file support.
  320.  
  321. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  322. ---
  323. daemon/upcall.h        |  3 ++-
  324.  daemon/volume.c        | 22 ++++++++++++++++++++++
  325.  include/from_kernel.h  | 17 +++++++++++++++++
  326.  sys/nfs41sys_volinfo.c |  1 +
  327.  4 files changed, 42 insertions(+), 1 deletion(-)
  328.  
  329. diff --git a/daemon/upcall.h b/daemon/upcall.h
  330. index 97d60f3..b17ec71 100644
  331. --- a/daemon/upcall.h
  332. +++ b/daemon/upcall.h
  333. @@ -169,8 +169,9 @@ typedef struct __volume_upcall_args {
  334.      int len;
  335.      union {
  336.          FILE_FS_SIZE_INFORMATION size;
  337. -        FILE_FS_FULL_SIZE_INFORMATION fullsize;
  338.          FILE_FS_ATTRIBUTE_INFORMATION attribute;
  339. +        FILE_FS_FULL_SIZE_INFORMATION fullsize;
  340. +        FILE_FS_SECTOR_SIZE_INFORMATION sector_size;
  341.      } info;
  342.  } volume_upcall_args;
  343.  
  344. diff --git a/daemon/volume.c b/daemon/volume.c
  345. index e019b61..406cddf 100644
  346. --- a/daemon/volume.c
  347. +++ b/daemon/volume.c
  348. @@ -148,6 +148,28 @@ static int handle_volume(void *daemon_context, nfs41_upcall *upcall)
  349.              &args->info.attribute);
  350.          break;
  351.  
  352. +    case FileFsSectorSizeInformation:
  353. +        args->len = sizeof(args->info.sector_size);
  354. +
  355. +        args->info.sector_size.LogicalBytesPerSector = BYTES_PER_SECTOR;
  356. +        args->info.sector_size.PhysicalBytesPerSectorForAtomicity =
  357. +            BYTES_PER_SECTOR;
  358. +        args->info.sector_size.PhysicalBytesPerSectorForPerformance =
  359. +            BYTES_PER_SECTOR;
  360. +        args->info.sector_size.FileSystemEffectivePhysicalBytesPerSectorForAtomicity =
  361. +            BYTES_PER_SECTOR;
  362. +        /*
  363. +         * |SSINFO_FLAGS_NO_SEEK_PENALTY| is required by
  364. +         * Cygwin/MSYS2/mingw to support sparse files
  365. +         */
  366. +        args->info.sector_size.Flags =
  367. +                SSINFO_FLAGS_ALIGNED_DEVICE |
  368. +                SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE |
  369. +                SSINFO_FLAGS_NO_SEEK_PENALTY;
  370. +        args->info.sector_size.ByteOffsetForSectorAlignment = 0;
  371. +        args->info.sector_size.ByteOffsetForPartitionAlignment = 0;
  372. +        break;
  373. +
  374.      default:
  375.          eprintf("unhandled fs query class %d\n", args->query);
  376.          status = ERROR_INVALID_PARAMETER;
  377. diff --git a/include/from_kernel.h b/include/from_kernel.h
  378. index ebd89d0..3c754c9 100644
  379. --- a/include/from_kernel.h
  380. +++ b/include/from_kernel.h
  381. @@ -378,6 +378,23 @@ typedef struct _FILE_FS_FULL_SIZE_INFORMATION {
  382.      ULONG BytesPerSector;
  383.  } FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION;
  384.  
  385. +#define SSINFO_FLAGS_ALIGNED_DEVICE                 0x00000001
  386. +#define SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE    0x00000002
  387. +#define SSINFO_FLAGS_NO_SEEK_PENALTY                0x00000004
  388. +#define SSINFO_FLAGS_TRIM_ENABLED                   0x00000008
  389. +#define SSINFO_FLAGS_BYTE_ADDRESSABLE               0x00000010
  390. +#define SSINFO_OFFSET_UNKNOWN (0xffffffff)
  391. +
  392. +typedef struct _FILE_FS_SECTOR_SIZE_INFORMATION {
  393. +    ULONG LogicalBytesPerSector;
  394. +    ULONG PhysicalBytesPerSectorForAtomicity;
  395. +    ULONG PhysicalBytesPerSectorForPerformance;
  396. +    ULONG FileSystemEffectivePhysicalBytesPerSectorForAtomicity;
  397. +    ULONG Flags;
  398. +    ULONG ByteOffsetForSectorAlignment;
  399. +    ULONG ByteOffsetForPartitionAlignment;
  400. +} FILE_FS_SECTOR_SIZE_INFORMATION, *PFILE_FS_SECTOR_SIZE_INFORMATION;
  401. +
  402.  typedef struct _FILE_INTERNAL_INFORMATION {
  403.      LARGE_INTEGER IndexNumber;
  404.  } FILE_INTERNAL_INFORMATION, *PFILE_INTERNAL_INFORMATION;
  405. diff --git a/sys/nfs41sys_volinfo.c b/sys/nfs41sys_volinfo.c
  406. index a3efb33..d4a0eeb 100644
  407. --- a/sys/nfs41sys_volinfo.c
  408. +++ b/sys/nfs41sys_volinfo.c
  409. @@ -231,6 +231,7 @@ NTSTATUS nfs41_QueryVolumeInformation(
  410.          /* else fall through and send the upcall */
  411.      case FileFsSizeInformation:
  412.      case FileFsFullSizeInformation:
  413. +    case FileFsSectorSizeInformation:
  414.          break;
  415.  
  416.      default:
  417. --
  418. 2.45.1
  419.  
  420. From 5dadcc95d3dcf592cdcfbe1a47d51f28a8ed6eed Mon Sep 17 00:00:00 2001
  421. From: Roland Mainz <roland.mainz@nrubsig.org>
  422. Date: Tue, 28 Jan 2025 14:54:22 +0100
  423. Subject: [PATCH 5/7] tests: Add winfsinfo "getfilefssectorsizeinformation"
  424.  subcmd
  425.  
  426. Add winfsinfo "getfilefssectorsizeinformation" subcmd to do
  427. a |FileFsSectorSizeInformation| volume query.
  428.  
  429. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  430. ---
  431. tests/winfsinfo1/winfsinfo.c | 166 ++++++++++++++++++++++++++++++++---
  432.  1 file changed, 155 insertions(+), 11 deletions(-)
  433.  
  434. diff --git a/tests/winfsinfo1/winfsinfo.c b/tests/winfsinfo1/winfsinfo.c
  435. index 06cbc2e..5decfe4 100644
  436. --- a/tests/winfsinfo1/winfsinfo.c
  437. +++ b/tests/winfsinfo1/winfsinfo.c
  438. @@ -147,6 +147,153 @@ done:
  439.      return res;
  440.  }
  441.  
  442. +typedef struct _IO_STATUS_BLOCK {
  443. +    union {
  444. +        NTSTATUS Status;
  445. +        PVOID Pointer;
  446. +    } DUMMYUNIONNAME;
  447. +    ULONG_PTR Information;
  448. +} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
  449. +
  450. +#ifdef _WIN64
  451. +#define NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE 1
  452. +#endif
  453. +
  454. +#define SSINFO_FLAGS_ALIGNED_DEVICE                 0x00000001
  455. +#define SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE    0x00000002
  456. +#define SSINFO_FLAGS_NO_SEEK_PENALTY                0x00000004
  457. +#define SSINFO_FLAGS_TRIM_ENABLED                   0x00000008
  458. +#define SSINFO_FLAGS_BYTE_ADDRESSABLE               0x00000010
  459. +#define SSINFO_OFFSET_UNKNOWN (0xffffffff)
  460. +
  461. +typedef struct _FILE_FS_SECTOR_SIZE_INFORMATION {
  462. +    ULONG LogicalBytesPerSector;
  463. +    ULONG PhysicalBytesPerSectorForAtomicity;
  464. +    ULONG PhysicalBytesPerSectorForPerformance;
  465. +    ULONG FileSystemEffectivePhysicalBytesPerSectorForAtomicity;
  466. +    ULONG Flags;
  467. +    ULONG ByteOffsetForSectorAlignment;
  468. +    ULONG ByteOffsetForPartitionAlignment;
  469. +} FILE_FS_SECTOR_SIZE_INFORMATION, *PFILE_FS_SECTOR_SIZE_INFORMATION;
  470. +
  471. +#define STATUS_SUCCESS ((NTSTATUS)0x00000000)
  472. +#define STATUS_NO_EAS_ON_FILE ((NTSTATUS)0xC0000052)
  473. +
  474. +typedef enum _FSINFOCLASS {
  475. +    FileFsVolumeInformation         = 1,
  476. +    FileFsLabelInformation,         // 2
  477. +    FileFsSizeInformation,          // 3
  478. +    FileFsDeviceInformation,        // 4
  479. +    FileFsAttributeInformation,     // 5
  480. +    FileFsControlInformation,       // 6
  481. +    FileFsFullSizeInformation,      // 7
  482. +    FileFsObjectIdInformation,      // 8
  483. +    FileFsDriverPathInformation,    // 9
  484. +    FileFsVolumeFlagsInformation,   // 10
  485. +    FileFsSectorSizeInformation,    // 11
  486. +    FileFsDataCopyInformation,      // 12
  487. +    FileFsMetadataSizeInformation,  // 13
  488. +    FileFsFullSizeInformationEx,    // 14
  489. +    FileFsMaximumInformation
  490. +} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
  491. +
  492. +#ifdef NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE
  493. +NTSYSAPI
  494. +NTSTATUS
  495. +ZwQueryVolumeInformationFile(
  496. +    HANDLE               FileHandle,
  497. +    PIO_STATUS_BLOCK     IoStatusBlock,
  498. +    PVOID                FsInformation,
  499. +    ULONG                Length,
  500. +    FS_INFORMATION_CLASS FsInformationClass
  501. +);
  502. +
  503. +static
  504. +bool getfilefssectorsizeinformation(const char *progname, const char *filename)
  505. +{
  506. +    int res = EXIT_FAILURE;
  507. +
  508. +    HANDLE fileHandle = CreateFileA(filename,
  509. +        GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
  510. +        FILE_FLAG_BACKUP_SEMANTICS, NULL);
  511. +    if (fileHandle == INVALID_HANDLE_VALUE) {
  512. +        (void)fprintf(stderr,
  513. +            "%s: Error opening file '%s'. Last error was %d.\n",
  514. +            progname,
  515. +            filename,
  516. +            (int)GetLastError());
  517. +        return EXIT_FAILURE;
  518. +    }
  519. +
  520. +    FILE_FS_SECTOR_SIZE_INFORMATION ffssi = { 0 };
  521. +    NTSTATUS status;
  522. +    IO_STATUS_BLOCK io;
  523. +
  524. +    status = ZwQueryVolumeInformationFile(fileHandle, &io, &ffssi, sizeof ffssi,
  525. +        FileFsSectorSizeInformation);
  526. +
  527. +    switch (status) {
  528. +        case STATUS_SUCCESS:
  529. +            break;
  530. +        default:
  531. +            (void)fprintf(stderr, "ZwQueryVolumeInformationFile() failed with 0x%lx\n", (long)status);
  532. +            res = EXIT_FAILURE;
  533. +            goto done;
  534. +    }
  535. +
  536. +    (void)printf("(\n");
  537. +    (void)printf("\tfilename='%s'\n", filename);
  538. +
  539. +    (void)printf("\tLogicalBytesPerSector=%lu\n",
  540. +        (unsigned long)ffssi.LogicalBytesPerSector);
  541. +    (void)printf("\tPhysicalBytesPerSectorForAtomicity=%lu\n",
  542. +        (unsigned long)ffssi.PhysicalBytesPerSectorForAtomicity);
  543. +    (void)printf("\tPhysicalBytesPerSectorForPerformance=%lu\n",
  544. +        (unsigned long)ffssi.PhysicalBytesPerSectorForPerformance);
  545. +    (void)printf("\t"
  546. +        "FileSystemEffectivePhysicalBytesPerSectorForAtomicity=%lu\n",
  547. +        (unsigned long)ffssi.FileSystemEffectivePhysicalBytesPerSectorForAtomicity);
  548. +
  549. +
  550. +    DWORD fssiflags = ffssi.Flags;
  551. +
  552. +    (void)printf("\ttypeset -a Flags=(\n");
  553. +
  554. +#define TESTFSSI(s) \
  555. +    if (fssiflags & (s)) { \
  556. +        (void)puts("\t\t"#s); \
  557. +        fssiflags &= ~(s); \
  558. +    }
  559. +    TESTFSSI(SSINFO_FLAGS_ALIGNED_DEVICE);
  560. +    TESTFSSI(SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE);
  561. +    TESTFSSI(SSINFO_FLAGS_NO_SEEK_PENALTY);
  562. +    TESTFSSI(SSINFO_FLAGS_TRIM_ENABLED);
  563. +    TESTFSSI(SSINFO_FLAGS_BYTE_ADDRESSABLE);
  564. +
  565. +    (void)printf("\t)\n");
  566. +
  567. +    /*
  568. +     * print any leftover flags not covered by |TESTFBIA(FILE_*)|
  569. +     * above
  570. +     */
  571. +    if (fssiflags) {
  572. +        (void)printf("\tFlags=0x%lx\n", (long)fssiflags);
  573. +    }
  574. +
  575. +    (void)printf("\tByteOffsetForSectorAlignment=%lu\n",
  576. +        (unsigned long)ffssi.ByteOffsetForSectorAlignment);
  577. +    (void)printf("\tByteOffsetForPartitionAlignment=%lu\n",
  578. +        (unsigned long)ffssi.ByteOffsetForPartitionAlignment);
  579. +
  580. +    (void)printf(")\n");
  581. +    res = EXIT_SUCCESS;
  582. +
  583. +done:
  584. +    (void)CloseHandle(fileHandle);
  585. +    return res;
  586. +}
  587. +#endif /* NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE */
  588. +
  589.  
  590.  static
  591.  bool get_file_basic_info(const char *progname, const char *filename)
  592. @@ -642,17 +789,6 @@ typedef struct _FILE_FULL_EA_INFORMATION {
  593.      CHAR EaName[1];
  594.  } FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION;
  595.  
  596. -typedef struct _IO_STATUS_BLOCK {
  597. -    union {
  598. -        NTSTATUS Status;
  599. -        PVOID Pointer;
  600. -    } DUMMYUNIONNAME;
  601. -    ULONG_PTR Information;
  602. -} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
  603. -
  604. -#define STATUS_SUCCESS ((NTSTATUS)0x00000000)
  605. -#define STATUS_NO_EAS_ON_FILE ((NTSTATUS)0xC0000052)
  606. -
  607.  NTSYSAPI
  608.  NTSTATUS
  609.  NTAPI
  610. @@ -772,6 +908,9 @@ void usage(void)
  611.  {
  612.      (void)fprintf(stderr, "winfsinfo <"
  613.          "getvolumeinfo|"
  614. +#ifdef NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE
  615. +        "getfilefssectorsizeinformation|"
  616. +#endif /* NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE */
  617.          "filebasicinfo|"
  618.          "fileexinfostandard|"
  619.          "filestandardinfo|"
  620. @@ -797,6 +936,11 @@ int main(int ac, char *av[])
  621.      if (!strcmp(subcmd, "getvolumeinfo")) {
  622.          return getvolumeinfo(av[0], av[2]);
  623.      }
  624. +#ifdef NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE
  625. +    if (!strcmp(subcmd, "getfilefssectorsizeinformation")) {
  626. +        return getfilefssectorsizeinformation(av[0], av[2]);
  627. +    }
  628. +#endif /* NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE */
  629.      else if (!strcmp(subcmd, "filebasicinfo")) {
  630.          return get_file_basic_info(av[0], av[2]);
  631.      }
  632. --
  633. 2.45.1
  634.  
  635. From 61aaf37140e4dcd8ee21958064771202c845c9d8 Mon Sep 17 00:00:00 2001
  636. From: Roland Mainz <roland.mainz@nrubsig.org>
  637. Date: Tue, 28 Jan 2025 15:10:43 +0100
  638. Subject: [PATCH 6/7] include,tests: winfsinfo should use include/from_kernel.h
  639.  
  640. cleanup: winfsinfo should use the "include/from_kernel.h" header to
  641. avoid code duplication.
  642.  
  643. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  644. ---
  645. include/from_kernel.h        |  4 +++
  646.  tests/winfsinfo1/winfsinfo.c | 54 +-----------------------------------
  647.  2 files changed, 5 insertions(+), 53 deletions(-)
  648.  
  649. diff --git a/include/from_kernel.h b/include/from_kernel.h
  650. index 3c754c9..c750239 100644
  651. --- a/include/from_kernel.h
  652. +++ b/include/from_kernel.h
  653. @@ -224,6 +224,10 @@ typedef struct _FILE_LINK_INFORMATION {
  654.      WCHAR FileName[1];
  655.  } FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION;
  656.  
  657. +typedef struct _FILE_EA_INFORMATION {
  658. +    ULONG EaSize;
  659. +} FILE_EA_INFORMATION, *PFILE_EA_INFORMATION;
  660. +
  661.  typedef struct _FILE_FULL_EA_INFORMATION {
  662.      ULONG NextEntryOffset;
  663.      UCHAR Flags;
  664. diff --git a/tests/winfsinfo1/winfsinfo.c b/tests/winfsinfo1/winfsinfo.c
  665. index 5decfe4..e9c098f 100644
  666. --- a/tests/winfsinfo1/winfsinfo.c
  667. +++ b/tests/winfsinfo1/winfsinfo.c
  668. @@ -39,6 +39,7 @@
  669.  #include <stdbool.h>
  670.  
  671.  #include "nfs_ea.h"
  672. +#include "from_kernel.h"
  673.  
  674.  static
  675.  bool filetime2localsystemtime(const FILETIME *ft, SYSTEMTIME *st)
  676. @@ -159,44 +160,9 @@ typedef struct _IO_STATUS_BLOCK {
  677.  #define NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE 1
  678.  #endif
  679.  
  680. -#define SSINFO_FLAGS_ALIGNED_DEVICE                 0x00000001
  681. -#define SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE    0x00000002
  682. -#define SSINFO_FLAGS_NO_SEEK_PENALTY                0x00000004
  683. -#define SSINFO_FLAGS_TRIM_ENABLED                   0x00000008
  684. -#define SSINFO_FLAGS_BYTE_ADDRESSABLE               0x00000010
  685. -#define SSINFO_OFFSET_UNKNOWN (0xffffffff)
  686. -
  687. -typedef struct _FILE_FS_SECTOR_SIZE_INFORMATION {
  688. -    ULONG LogicalBytesPerSector;
  689. -    ULONG PhysicalBytesPerSectorForAtomicity;
  690. -    ULONG PhysicalBytesPerSectorForPerformance;
  691. -    ULONG FileSystemEffectivePhysicalBytesPerSectorForAtomicity;
  692. -    ULONG Flags;
  693. -    ULONG ByteOffsetForSectorAlignment;
  694. -    ULONG ByteOffsetForPartitionAlignment;
  695. -} FILE_FS_SECTOR_SIZE_INFORMATION, *PFILE_FS_SECTOR_SIZE_INFORMATION;
  696. -
  697.  #define STATUS_SUCCESS ((NTSTATUS)0x00000000)
  698.  #define STATUS_NO_EAS_ON_FILE ((NTSTATUS)0xC0000052)
  699.  
  700. -typedef enum _FSINFOCLASS {
  701. -    FileFsVolumeInformation         = 1,
  702. -    FileFsLabelInformation,         // 2
  703. -    FileFsSizeInformation,          // 3
  704. -    FileFsDeviceInformation,        // 4
  705. -    FileFsAttributeInformation,     // 5
  706. -    FileFsControlInformation,       // 6
  707. -    FileFsFullSizeInformation,      // 7
  708. -    FileFsObjectIdInformation,      // 8
  709. -    FileFsDriverPathInformation,    // 9
  710. -    FileFsVolumeFlagsInformation,   // 10
  711. -    FileFsSectorSizeInformation,    // 11
  712. -    FileFsDataCopyInformation,      // 12
  713. -    FileFsMetadataSizeInformation,  // 13
  714. -    FileFsFullSizeInformationEx,    // 14
  715. -    FileFsMaximumInformation
  716. -} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
  717. -
  718.  #ifdef NTDLL_HAS_ZWQUERYVOLUMEINFORMATIONFILE
  719.  NTSYSAPI
  720.  NTSTATUS
  721. @@ -771,24 +737,6 @@ done:
  722.      return res;
  723.  }
  724.  
  725. -typedef struct _FILE_EA_INFORMATION {
  726. -    ULONG EaSize;
  727. -} FILE_EA_INFORMATION, *PFILE_EA_INFORMATION;
  728. -
  729. -typedef struct _FILE_GET_EA_INFORMATION {
  730. -    ULONG NextEntryOffset;
  731. -    UCHAR EaNameLength;
  732. -    CHAR  EaName[1];
  733. -} FILE_GET_EA_INFORMATION, *PFILE_GET_EA_INFORMATION;
  734. -
  735. -typedef struct _FILE_FULL_EA_INFORMATION {
  736. -    ULONG NextEntryOffset;
  737. -    UCHAR Flags;
  738. -    UCHAR EaNameLength;
  739. -    USHORT EaValueLength;
  740. -    CHAR EaName[1];
  741. -} FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION;
  742. -
  743.  NTSYSAPI
  744.  NTSTATUS
  745.  NTAPI
  746. --
  747. 2.45.1
  748.  
  749. From 48608572e113c4e95536e6f0e15fe2c7a58fd72a Mon Sep 17 00:00:00 2001
  750. From: Roland Mainz <roland.mainz@nrubsig.org>
  751. Date: Tue, 28 Jan 2025 16:35:55 +0100
  752. Subject: [PATCH 7/7] daemon: Enable |FILE_ATTRIBUTE_SPARSE_FILE| for regular
  753.  files by default
  754.  
  755. Enable |FILE_ATTRIBUTE_SPARSE_FILE| for regular files by default.
  756.  
  757. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  758. ---
  759. daemon/fileinfoutil.c     | 31 ++++++++++++++++++++++++-------
  760.  daemon/getattr.c          | 28 ++++++++++++++++++++++------
  761.  daemon/nfs41.h            |  1 +
  762.  daemon/nfs41_superblock.c |  6 +++++-
  763.  daemon/open.c             | 27 +++++++++++++++++++++------
  764.  daemon/readdir.c          | 22 +++++++++++++---------
  765.  daemon/util.h             |  8 ++++++++
  766.  7 files changed, 94 insertions(+), 29 deletions(-)
  767.  
  768. diff --git a/daemon/fileinfoutil.c b/daemon/fileinfoutil.c
  769. index f86aa5a..93fbde5 100644
  770. --- a/daemon/fileinfoutil.c
  771. +++ b/daemon/fileinfoutil.c
  772. @@ -1,6 +1,6 @@
  773.  /* NFSv4.1 client for Windows
  774.   * Copyright (C) 2012 The Regents of the University of Michigan
  775. - * Copyright (C) 2023-2024 Roland Mainz <roland.mainz@nrubsig.org>
  776. + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org>
  777.   *
  778.   * Olga Kornievskaia <aglo@umich.edu>
  779.   * Casey Bodley <cbodley@umich.edu>
  780. @@ -35,6 +35,7 @@
  781.  
  782.  
  783.  ULONG nfs_file_info_to_attributes(
  784. +    IN const nfs41_superblock *restrict superblock,
  785.      IN const nfs41_file_info *restrict info)
  786.  {
  787.      ULONG attrs = 0;
  788. @@ -46,7 +47,13 @@ ULONG nfs_file_info_to_attributes(
  789.          if (info->symlink_dir)
  790.              attrs |= FILE_ATTRIBUTE_DIRECTORY;
  791.      }
  792. -    else if (info->type != NF4REG) {
  793. +    else if (info->type == NF4REG) {
  794. +        if (superblock->sparse_file_support) {
  795. +            /* FIXME: What about pNFS ? */
  796. +            attrs |= FILE_ATTRIBUTE_SPARSE_FILE;
  797. +        }
  798. +    }
  799. +    else {
  800.          DPRINTF(1,
  801.              ("nfs_file_info_to_attributes: "
  802.              "unhandled file type %d, defaulting to NF4REG\n",
  803. @@ -75,6 +82,7 @@ ULONG nfs_file_info_to_attributes(
  804.  
  805.  void nfs_to_basic_info(
  806.      IN const char *restrict name,
  807. +    IN const nfs41_superblock *restrict superblock,
  808.      IN const nfs41_file_info *restrict info,
  809.      OUT PFILE_BASIC_INFO basic_out)
  810.  {
  811. @@ -117,14 +125,17 @@ void nfs_to_basic_info(
  812.          basic_out->ChangeTime.QuadPart = FILE_INFO_TIME_NOT_SET;
  813.      }
  814.  
  815. -    basic_out->FileAttributes = nfs_file_info_to_attributes(info);
  816. +    basic_out->FileAttributes =
  817. +        nfs_file_info_to_attributes(superblock, info);
  818.  }
  819.  
  820.  void nfs_to_standard_info(
  821. +    IN const nfs41_superblock *restrict superblock,
  822.      IN const nfs41_file_info *restrict info,
  823.      OUT PFILE_STANDARD_INFO restrict std_out)
  824.  {
  825. -    const ULONG FileAttributes = nfs_file_info_to_attributes(info);
  826. +    const ULONG FileAttributes =
  827. +        nfs_file_info_to_attributes(superblock, info);
  828.  
  829.      EASSERT(info->attrmask.arr[0] & FATTR4_WORD0_SIZE);
  830.      EASSERT((info->attrmask.count > 0) &&
  831. @@ -140,6 +151,7 @@ void nfs_to_standard_info(
  832.  
  833.  void nfs_to_network_openinfo(
  834.      IN const char *restrict name,
  835. +    IN const nfs41_superblock *restrict superblock,
  836.      IN const nfs41_file_info *restrict info,
  837.      OUT PFILE_NETWORK_OPEN_INFORMATION restrict net_out)
  838.  {
  839. @@ -184,12 +196,14 @@ void nfs_to_network_openinfo(
  840.  
  841.      net_out->AllocationSize.QuadPart =
  842.          net_out->EndOfFile.QuadPart = (LONGLONG)info->size;
  843. -    net_out->FileAttributes = nfs_file_info_to_attributes(info);
  844. +    net_out->FileAttributes =
  845. +        nfs_file_info_to_attributes(superblock, info);
  846.  }
  847.  
  848.  #ifdef NFS41_DRIVER_WSL_SUPPORT
  849.  void nfs_to_stat_info(
  850.      IN const char *restrict name,
  851. +    IN const nfs41_superblock *restrict superblock,
  852.      IN const nfs41_file_info *restrict info,
  853.      OUT PFILE_STAT_INFORMATION restrict stat_out)
  854.  {
  855. @@ -237,7 +251,8 @@ void nfs_to_stat_info(
  856.      stat_out->AllocationSize.QuadPart =
  857.          stat_out->EndOfFile.QuadPart = (LONGLONG)info->size;
  858.  
  859. -    stat_out->FileAttributes = nfs_file_info_to_attributes(info);
  860. +    stat_out->FileAttributes =
  861. +        nfs_file_info_to_attributes(superblock, info);
  862.  
  863.      stat_out->ReparseTag = (info->type == NF4LNK)?
  864.          IO_REPARSE_TAG_SYMLINK : 0;
  865. @@ -250,6 +265,7 @@ void nfs_to_stat_info(
  866.  void nfs_to_stat_lx_info(
  867.      IN void *daemon_context,
  868.      IN const char *restrict name,
  869. +    IN const nfs41_superblock *restrict superblock,
  870.      IN const nfs41_file_info *restrict info,
  871.      OUT PFILE_STAT_LX_INFORMATION restrict stat_lx_out)
  872.  {
  873. @@ -303,7 +319,8 @@ void nfs_to_stat_lx_info(
  874.      stat_lx_out->AllocationSize.QuadPart =
  875.          stat_lx_out->EndOfFile.QuadPart = (LONGLONG)info->size;
  876.  
  877. -    stat_lx_out->FileAttributes = nfs_file_info_to_attributes(info);
  878. +    stat_lx_out->FileAttributes =
  879. +        nfs_file_info_to_attributes(superblock, info);
  880.  
  881.      stat_lx_out->ReparseTag = (info->type == NF4LNK)?
  882.          IO_REPARSE_TAG_SYMLINK : 0;
  883. diff --git a/daemon/getattr.c b/daemon/getattr.c
  884. index 8356062..95cb36e 100644
  885. --- a/daemon/getattr.c
  886. +++ b/daemon/getattr.c
  887. @@ -171,13 +171,20 @@ static int handle_getattr(void *daemon_context, nfs41_upcall *upcall)
  888.  
  889.      switch (args->query_class) {
  890.      case FileBasicInformation:
  891. -        nfs_to_basic_info(state->file.name.name, &info, &args->basic_info);
  892. +        nfs_to_basic_info(state->file.name.name,
  893. +            state->file.fh.superblock,
  894. +            &info,
  895. +            &args->basic_info);
  896.          break;
  897.      case FileStandardInformation:
  898. -        nfs_to_standard_info(&info, &args->std_info);
  899. +        nfs_to_standard_info(state->file.fh.superblock,
  900. +            &info,
  901. +            &args->std_info);
  902.          break;
  903.      case FileAttributeTagInformation:
  904. -        args->tag_info.FileAttributes = nfs_file_info_to_attributes(&info);
  905. +        args->tag_info.FileAttributes =
  906. +            nfs_file_info_to_attributes(state->file.fh.superblock,
  907. +                &info);
  908.          args->tag_info.ReparseTag = info.type == NF4LNK ?
  909.              IO_REPARSE_TAG_SYMLINK : 0;
  910.          break;
  911. @@ -185,15 +192,24 @@ static int handle_getattr(void *daemon_context, nfs41_upcall *upcall)
  912.          args->intr_info.IndexNumber.QuadPart = info.fileid;
  913.          break;
  914.      case FileNetworkOpenInformation:
  915. -        nfs_to_network_openinfo(state->file.name.name, &info, &args->network_info);
  916. +        nfs_to_network_openinfo(state->file.name.name,
  917. +            state->file.fh.superblock,
  918. +            &info,
  919. +            &args->network_info);
  920.          break;
  921.  #ifdef NFS41_DRIVER_WSL_SUPPORT
  922.      case FileStatInformation:
  923. -        nfs_to_stat_info(state->file.name.name, &info, &args->stat_info);
  924. +        nfs_to_stat_info(state->file.name.name,
  925. +            state->file.fh.superblock,
  926. +            &info,
  927. +            &args->stat_info);
  928.          break;
  929.      case FileStatLxInformation:
  930.          nfs_to_stat_lx_info(daemon_context,
  931. -            state->file.name.name, &info, &args->stat_lx_info);
  932. +            state->file.name.name,
  933. +            state->file.fh.superblock,
  934. +            &info,
  935. +            &args->stat_lx_info);
  936.          break;
  937.  #endif /* NFS41_DRIVER_WSL_SUPPORT */
  938.      default:
  939. diff --git a/daemon/nfs41.h b/daemon/nfs41.h
  940. index 5168901..38ede22 100644
  941. --- a/daemon/nfs41.h
  942. +++ b/daemon/nfs41.h
  943. @@ -58,6 +58,7 @@ typedef struct __nfs41_superblock {
  944.      unsigned int ea_support : 1;
  945.      unsigned int case_preserving : 1;
  946.      unsigned int case_insensitive : 1;
  947. +    unsigned int sparse_file_support : 1;
  948.  
  949.      /* variable filesystem attributes */
  950.      uint64_t space_avail;
  951. diff --git a/daemon/nfs41_superblock.c b/daemon/nfs41_superblock.c
  952. index c30d0e2..0a8992b 100644
  953. --- a/daemon/nfs41_superblock.c
  954. +++ b/daemon/nfs41_superblock.c
  955. @@ -1,8 +1,10 @@
  956.  /* NFSv4.1 client for Windows
  957. - * Copyright (C) 2012 The Regents of the University of Michigan
  958. + * Copyright (C) 2012 The Regents of the University of Michigan
  959. + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org>
  960.   *
  961.   * Olga Kornievskaia <aglo@umich.edu>
  962.   * Casey Bodley <cbodley@umich.edu>
  963. + * Roland Mainz <roland.mainz@nrubsig.org>
  964.   *
  965.   * This library is free software; you can redistribute it and/or modify it
  966.   * under the terms of the GNU Lesser General Public License as published by
  967. @@ -122,6 +124,7 @@ static int get_superblock_attrs(
  968.      superblock->ea_support = supports_named_attrs;
  969.      superblock->case_preserving = info.case_preserving;
  970.      superblock->case_insensitive = info.case_insensitive;
  971. +    superblock->sparse_file_support = 1; /* always ON for now */
  972.  
  973.      if (bitmap_isset(&info.attrmask, 0, FATTR4_WORD0_CANSETTIME))
  974.          superblock->cansettime = info.cansettime;
  975. @@ -167,6 +170,7 @@ void nfs41_superblock_fs_attributes(
  976.      OUT PFILE_FS_ATTRIBUTE_INFORMATION FsAttrs)
  977.  {
  978.      FsAttrs->FileSystemAttributes = 0;
  979. +    FsAttrs->FileSystemAttributes |= FILE_SUPPORTS_SPARSE_FILES;
  980.      FsAttrs->FileSystemAttributes |= FILE_SUPPORTS_REMOTE_STORAGE;
  981.      /* NFSv4 protocol uses Unicode by default */
  982.      FsAttrs->FileSystemAttributes |= FILE_UNICODE_ON_DISK;
  983. diff --git a/daemon/open.c b/daemon/open.c
  984. index 1c8b568..58e1348 100644
  985. --- a/daemon/open.c
  986. +++ b/daemon/open.c
  987. @@ -778,8 +778,13 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  988.              status = map_symlink_errors(status);
  989.              goto out_free_state;
  990.          }
  991. -        nfs_to_basic_info(state->file.name.name, &info, &args->basic_info);
  992. -        nfs_to_standard_info(&info, &args->std_info);
  993. +        nfs_to_basic_info(state->file.name.name,
  994. +            state->file.fh.superblock,
  995. +            &info,
  996. +            &args->basic_info);
  997. +        nfs_to_standard_info(state->file.fh.superblock,
  998. +            &info,
  999. +            &args->std_info);
  1000.          EASSERT((info.attrmask.count > 0) &&
  1001.              (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  1002.          args->fileid = info.fileid;
  1003. @@ -800,8 +805,13 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  1004.              goto out_free_state;
  1005.          }
  1006.  
  1007. -        nfs_to_basic_info(state->file.name.name, &info, &args->basic_info);
  1008. -        nfs_to_standard_info(&info, &args->std_info);
  1009. +        nfs_to_basic_info(state->file.name.name,
  1010. +            state->file.fh.superblock,
  1011. +            &info,
  1012. +            &args->basic_info);
  1013. +        nfs_to_standard_info(state->file.fh.superblock,
  1014. +            &info,
  1015. +            &args->std_info);
  1016.          EASSERT((info.attrmask.count > 0) &&
  1017.              (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  1018.          args->fileid = info.fileid;
  1019. @@ -1039,8 +1049,13 @@ create_chgrp_out:
  1020.              }
  1021.  #endif /* NFS41_DRIVER_SETGID_NEWGRP_SUPPORT */
  1022.  
  1023. -            nfs_to_basic_info(state->file.name.name, &info, &args->basic_info);
  1024. -            nfs_to_standard_info(&info, &args->std_info);
  1025. +            nfs_to_basic_info(state->file.name.name,
  1026. +                state->file.fh.superblock,
  1027. +                &info,
  1028. +                &args->basic_info);
  1029. +            nfs_to_standard_info(state->file.fh.superblock,
  1030. +                &info,
  1031. +                &args->std_info);
  1032.              EASSERT((info.attrmask.count > 0) &&
  1033.                  (info.attrmask.arr[0] & FATTR4_WORD0_FILEID));
  1034.              args->fileid = info.fileid;
  1035. diff --git a/daemon/readdir.c b/daemon/readdir.c
  1036. index fd7d257..e7f7706 100644
  1037. --- a/daemon/readdir.c
  1038. +++ b/daemon/readdir.c
  1039. @@ -322,6 +322,7 @@ static uint32_t readdir_size_for_entry(
  1040.  
  1041.  static void readdir_copy_dir_info(
  1042.      IN nfs41_readdir_entry *entry,
  1043. +    IN const nfs41_superblock *restrict superblock,
  1044.      IN PFILE_DIR_INFO_UNION info)
  1045.  {
  1046.      info->fdi.FileIndex = (ULONG)entry->attr_info.fileid;
  1047. @@ -372,8 +373,8 @@ static void readdir_copy_dir_info(
  1048.      info->fdi.EndOfFile.QuadPart =
  1049.          info->fdi.AllocationSize.QuadPart =
  1050.              entry->attr_info.size;
  1051. -    info->fdi.FileAttributes = nfs_file_info_to_attributes(
  1052. -        &entry->attr_info);
  1053. +    info->fdi.FileAttributes =
  1054. +        nfs_file_info_to_attributes(superblock, &entry->attr_info);
  1055.  }
  1056.  
  1057.  #ifndef NFS41_DRIVER_DISABLE_8DOT3_SHORTNAME_GENERATION
  1058. @@ -393,9 +394,10 @@ static void readdir_copy_shortname(
  1059.  
  1060.  static void readdir_copy_full_dir_info(
  1061.      IN nfs41_readdir_entry *entry,
  1062. +    IN const nfs41_superblock *restrict superblock,
  1063.      IN PFILE_DIR_INFO_UNION info)
  1064.  {
  1065. -    readdir_copy_dir_info(entry, info);
  1066. +    readdir_copy_dir_info(entry, superblock, info);
  1067.      /* for files with the FILE_ATTRIBUTE_REPARSE_POINT attribute,
  1068.       * EaSize is used instead to specify its reparse tag. this makes
  1069.       * the 'dir' command to show files as <SYMLINK>, and triggers a
  1070. @@ -408,9 +410,10 @@ static void readdir_copy_full_dir_info(
  1071.  static void readdir_copy_both_dir_info(
  1072.      IN nfs41_readdir_entry *entry,
  1073.      IN LPWSTR wname,
  1074. +    IN const nfs41_superblock *restrict superblock,
  1075.      IN PFILE_DIR_INFO_UNION info)
  1076.  {
  1077. -    readdir_copy_full_dir_info(entry, info);
  1078. +    readdir_copy_full_dir_info(entry, superblock, info);
  1079.  #ifdef NFS41_DRIVER_DISABLE_8DOT3_SHORTNAME_GENERATION
  1080.      info->fbdi.ShortName[0] = L'\0';
  1081.      info->fbdi.ShortNameLength = 0;
  1082. @@ -512,6 +515,7 @@ static int readdir_copy_entry(
  1083.      WCHAR wname[NFS4_OPAQUE_LIMIT];
  1084.      uint32_t wname_len, wname_size, needed;
  1085.      PFILE_DIR_INFO_UNION info;
  1086. +    const nfs41_superblock *superblock = args->state->file.fh.superblock;
  1087.  
  1088.      wname_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
  1089.          entry->name, entry->name_len, wname, NFS4_OPAQUE_LIMIT);
  1090. @@ -552,28 +556,28 @@ static int readdir_copy_entry(
  1091.              info->fni.FileName, &info->fni.FileNameLength);
  1092.          break;
  1093.      case FileDirectoryInformation:
  1094. -        readdir_copy_dir_info(entry, info);
  1095. +        readdir_copy_dir_info(entry, superblock, info);
  1096.          readdir_copy_filename(wname, wname_size,
  1097.              info->fdi.FileName, &info->fdi.FileNameLength);
  1098.          break;
  1099.      case FileFullDirectoryInformation:
  1100. -        readdir_copy_full_dir_info(entry, info);
  1101. +        readdir_copy_full_dir_info(entry, superblock, info);
  1102.          readdir_copy_filename(wname, wname_size,
  1103.              info->ffdi.FileName, &info->ffdi.FileNameLength);
  1104.          break;
  1105.      case FileIdFullDirectoryInformation:
  1106. -        readdir_copy_full_dir_info(entry, info);
  1107. +        readdir_copy_full_dir_info(entry, superblock, info);
  1108.          info->fibdi.FileId.QuadPart = (LONGLONG)entry->attr_info.fileid;
  1109.          readdir_copy_filename(wname, wname_size,
  1110.              info->fifdi.FileName, &info->fifdi.FileNameLength);
  1111.          break;
  1112.      case FileBothDirectoryInformation:
  1113. -        readdir_copy_both_dir_info(entry, wname, info);
  1114. +        readdir_copy_both_dir_info(entry, wname, superblock, info);
  1115.          readdir_copy_filename(wname, wname_size,
  1116.              info->fbdi.FileName, &info->fbdi.FileNameLength);
  1117.          break;
  1118.      case FileIdBothDirectoryInformation:
  1119. -        readdir_copy_both_dir_info(entry, wname, info);
  1120. +        readdir_copy_both_dir_info(entry, wname, superblock, info);
  1121.          info->fibdi.FileId.QuadPart = (LONGLONG)entry->attr_info.fileid;
  1122.          readdir_copy_filename(wname, wname_size,
  1123.              info->fibdi.FileName, &info->fibdi.FileNameLength);
  1124. diff --git a/daemon/util.h b/daemon/util.h
  1125. index 46d64b8..a5d0d73 100644
  1126. --- a/daemon/util.h
  1127. +++ b/daemon/util.h
  1128. @@ -33,6 +33,8 @@
  1129.  extern DWORD NFS41D_VERSION;
  1130.  struct __nfs41_session;
  1131.  struct __nfs41_write_verf;
  1132. +typedef struct __nfs41_file_info nfs41_file_info;
  1133. +typedef struct __nfs41_superblock nfs41_superblock;
  1134.  enum stable_how4;
  1135.  
  1136.  /*
  1137. @@ -174,26 +176,32 @@ static __inline void open_delegation4_cpy(
  1138.  }
  1139.  
  1140.  ULONG nfs_file_info_to_attributes(
  1141. +    IN const nfs41_superblock *restrict superblock,
  1142.      IN const nfs41_file_info *restrict info);
  1143.  void nfs_to_basic_info(
  1144.      IN const char *restrict name,
  1145. +    IN const nfs41_superblock *restrict superblock,
  1146.      IN const nfs41_file_info *restrict info,
  1147.      OUT PFILE_BASIC_INFO restrict basic_out);
  1148.  void nfs_to_standard_info(
  1149. +    IN const nfs41_superblock *restrict superblock,
  1150.      IN const nfs41_file_info *restrict info,
  1151.      OUT PFILE_STANDARD_INFO restrict std_out);
  1152.  void nfs_to_network_openinfo(
  1153.      IN const char *restrict name,
  1154. +    IN const nfs41_superblock *restrict superblock,
  1155.      IN const nfs41_file_info *restrict info,
  1156.      OUT PFILE_NETWORK_OPEN_INFORMATION restrict std_out);
  1157.  #ifdef NFS41_DRIVER_WSL_SUPPORT
  1158.  void nfs_to_stat_info(
  1159.      IN const char *restrict name,
  1160. +    IN const nfs41_superblock *restrict superblock,
  1161.      IN const nfs41_file_info *restrict info,
  1162.      OUT PFILE_STAT_INFORMATION restrict stat_out);
  1163.  void nfs_to_stat_lx_info(
  1164.      IN void *daemon_context,
  1165.      IN const char *restrict name,
  1166. +    IN const nfs41_superblock *restrict superblock,
  1167.      IN const nfs41_file_info *restrict info,
  1168.      OUT PFILE_STAT_LX_INFORMATION restrict stat_lx_out);
  1169.  #endif /* NFS41_DRIVER_WSL_SUPPORT */
  1170. --
  1171. 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