pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for setattr+misc, 2024-11-04
Posted by Anonymous on Mon 4th Nov 2024 16:52
raw | new post

  1. From ed2838ea466b1b524c26a244bb7155c6dd252d0d Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Mon, 4 Nov 2024 15:11:25 +0100
  4. Subject: [PATCH 1/4] daemon: |nfs41_setattr()|: Always do a (cache) lookup to
  5.  get the correct attribute differences
  6.  
  7. |nfs41_setattr()| should always do a |nfs41_attr_cache_lookup()|
  8. to make sure we always get the correct differences between old and new
  9. attribute data.
  10.  
  11. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  12. ---
  13. daemon/setattr.c | 80 ++++++++++++++++++++++++++++--------------------
  14.  1 file changed, 47 insertions(+), 33 deletions(-)
  15.  
  16. diff --git a/daemon/setattr.c b/daemon/setattr.c
  17. index 6209f43..5c04d24 100644
  18. --- a/daemon/setattr.c
  19. +++ b/daemon/setattr.c
  20. @@ -3,6 +3,7 @@
  21.   *
  22.   * Olga Kornievskaia <aglo@umich.edu>
  23.   * Casey Bodley <cbodley@umich.edu>
  24. + * Roland Mainz <roland.mainz@nrubsig.org>
  25.   *
  26.   * This library is free software; you can redistribute it and/or modify it
  27.   * under the terms of the GNU Lesser General Public License as published by
  28. @@ -62,34 +63,52 @@ static int handle_nfs41_setattr(void *daemon_context, setattr_upcall_args *args)
  29.      nfs41_superblock *superblock = state->file.fh.superblock;
  30.      stateid_arg stateid;
  31.      nfs41_file_info info = { 0 }, old_info = { 0 };
  32. -    int status = NO_ERROR, getattr_status;
  33. -      
  34. -       if (basic_info->FileAttributes) {
  35. -               info.hidden = basic_info->FileAttributes & FILE_ATTRIBUTE_HIDDEN ? 1 : 0;
  36. -               info.system = basic_info->FileAttributes & FILE_ATTRIBUTE_SYSTEM ? 1 : 0;
  37. -               info.archive = basic_info->FileAttributes & FILE_ATTRIBUTE_ARCHIVE ? 1 : 0;
  38. -               getattr_status = nfs41_attr_cache_lookup(session_name_cache(state->session),
  39. -                       state->file.fh.fileid, &old_info);
  40. -
  41. -               if (getattr_status || info.hidden != old_info.hidden) {
  42. -                       info.attrmask.arr[0] = FATTR4_WORD0_HIDDEN;
  43. -                       info.attrmask.count = 1;
  44. -               }
  45. -               if (getattr_status || info.archive != old_info.archive) {
  46. -                       info.attrmask.arr[0] |= FATTR4_WORD0_ARCHIVE;
  47. -                       info.attrmask.count = 1;
  48. -               }
  49. -               if (getattr_status || info.system != old_info.system) {
  50. -                       info.attrmask.arr[1] = FATTR4_WORD1_SYSTEM;
  51. -                       info.attrmask.count = 2;
  52. -               }
  53. -       }
  54. -    if (old_info.mode == 0444 &&
  55. -            ((basic_info->FileAttributes & FILE_ATTRIBUTE_READONLY) == 0)) {
  56. -        info.mode = 0644;
  57. +    int status = NO_ERROR;
  58. +    int getattr_status;
  59. +
  60. +    getattr_status = nfs41_attr_cache_lookup(session_name_cache(state->session),
  61. +        state->file.fh.fileid, &old_info);
  62. +    if (getattr_status) {
  63. +        DPRINTF(0, ("handle_nfs41_setattr(args->path='%s'): "
  64. +            "nfs41_attr_cache_lookup() failed with error '%s'.\n",
  65. +            args->path,
  66. +            nfs_error_string(getattr_status)));
  67. +        status = nfs_to_windows_error(getattr_status, ERROR_NOT_SUPPORTED);
  68. +        goto out;
  69. +    }
  70. +
  71. +    if (basic_info->FileAttributes) {
  72. +        info.hidden = basic_info->FileAttributes & FILE_ATTRIBUTE_HIDDEN ? 1 : 0;
  73. +        info.system = basic_info->FileAttributes & FILE_ATTRIBUTE_SYSTEM ? 1 : 0;
  74. +        info.archive = basic_info->FileAttributes & FILE_ATTRIBUTE_ARCHIVE ? 1 : 0;
  75. +
  76. +        if (info.hidden != old_info.hidden) {
  77. +            info.attrmask.arr[0] = FATTR4_WORD0_HIDDEN;
  78. +            info.attrmask.count = 1;
  79. +        }
  80. +        if (info.archive != old_info.archive) {
  81. +            info.attrmask.arr[0] |= FATTR4_WORD0_ARCHIVE;
  82. +            info.attrmask.count = 1;
  83. +        }
  84. +        if (info.system != old_info.system) {
  85. +            info.attrmask.arr[1] = FATTR4_WORD1_SYSTEM;
  86. +            info.attrmask.count = 2;
  87. +        }
  88. +    }
  89. +
  90. +    /* mode */
  91. +    if (basic_info->FileAttributes & FILE_ATTRIBUTE_READONLY) {
  92. +        info.mode = 0444;
  93.          info.attrmask.arr[1] |= FATTR4_WORD1_MODE;
  94.          info.attrmask.count = 2;
  95.      }
  96. +    else {
  97. +        if (old_info.mode == 0444) {
  98. +            info.mode = 0644;
  99. +            info.attrmask.arr[1] |= FATTR4_WORD1_MODE;
  100. +            info.attrmask.count = 2;
  101. +        }
  102. +    }
  103.  
  104.      if (superblock->cansettime) {
  105.          /* set the time_delta so xdr_settime4() can decide
  106. @@ -119,13 +138,6 @@ static int handle_nfs41_setattr(void *daemon_context, setattr_upcall_args *args)
  107.          }
  108.      }
  109.  
  110. -    /* mode */
  111. -    if (basic_info->FileAttributes & FILE_ATTRIBUTE_READONLY) {
  112. -        info.mode = 0444;
  113. -        info.attrmask.arr[1] |= FATTR4_WORD1_MODE;
  114. -        info.attrmask.count = 2;
  115. -    }
  116. -
  117.      /* mask out unsupported attributes */
  118.      nfs41_superblock_supported_attrs(superblock, &info.attrmask);
  119.  
  120. @@ -140,7 +152,9 @@ static int handle_nfs41_setattr(void *daemon_context, setattr_upcall_args *args)
  121.  
  122.      status = nfs41_setattr(state->session, &state->file, &stateid, &info);
  123.      if (status) {
  124. -        DPRINTF(1, ("nfs41_setattr() failed with error '%s'.\n",
  125. +        DPRINTF(1, ("handle_nfs41_setattr(args->path='%s'): "
  126. +            "nfs41_setattr() failed with error '%s'.\n",
  127. +            args->path,
  128.              nfs_error_string(status)));
  129.          status = nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
  130.          goto out;
  131. --
  132. 2.45.1
  133.  
  134. From 10136c21d7609d2c1e6fc172cb4c18cb66693e0f Mon Sep 17 00:00:00 2001
  135. From: Roland Mainz <roland.mainz@nrubsig.org>
  136. Date: Mon, 4 Nov 2024 15:16:22 +0100
  137. Subject: [PATCH 2/4] daemon: Rename |handle_nfs41_setattr()| to
  138.  |handle_nfs41_setattr_basicinfo()|
  139.  
  140. Rename |handle_nfs41_setattr()| to |handle_nfs41_setattr_basicinfo()|
  141. as preparation of handling more fileinfo classes.
  142.  
  143. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  144. ---
  145. daemon/setattr.c | 8 ++++----
  146.  1 file changed, 4 insertions(+), 4 deletions(-)
  147.  
  148. diff --git a/daemon/setattr.c b/daemon/setattr.c
  149. index 5c04d24..4f782c8 100644
  150. --- a/daemon/setattr.c
  151. +++ b/daemon/setattr.c
  152. @@ -56,7 +56,7 @@ out:
  153.      return status;
  154.  }
  155.  
  156. -static int handle_nfs41_setattr(void *daemon_context, setattr_upcall_args *args)
  157. +static int handle_nfs41_setattr_basicinfo(void *daemon_context, setattr_upcall_args *args)
  158.  {
  159.      PFILE_BASIC_INFO basic_info = (PFILE_BASIC_INFO)args->buf;
  160.      nfs41_open_state *state = args->state;
  161. @@ -69,7 +69,7 @@ static int handle_nfs41_setattr(void *daemon_context, setattr_upcall_args *args)
  162.      getattr_status = nfs41_attr_cache_lookup(session_name_cache(state->session),
  163.          state->file.fh.fileid, &old_info);
  164.      if (getattr_status) {
  165. -        DPRINTF(0, ("handle_nfs41_setattr(args->path='%s'): "
  166. +        DPRINTF(0, ("handle_nfs41_setattr_basicinfo(args->path='%s'): "
  167.              "nfs41_attr_cache_lookup() failed with error '%s'.\n",
  168.              args->path,
  169.              nfs_error_string(getattr_status)));
  170. @@ -152,7 +152,7 @@ static int handle_nfs41_setattr(void *daemon_context, setattr_upcall_args *args)
  171.  
  172.      status = nfs41_setattr(state->session, &state->file, &stateid, &info);
  173.      if (status) {
  174. -        DPRINTF(1, ("handle_nfs41_setattr(args->path='%s'): "
  175. +        DPRINTF(1, ("handle_nfs41_setattr_basicinfo(args->path='%s'): "
  176.              "nfs41_setattr() failed with error '%s'.\n",
  177.              args->path,
  178.              nfs_error_string(status)));
  179. @@ -518,7 +518,7 @@ static int handle_setattr(void *daemon_context, nfs41_upcall *upcall)
  180.  
  181.      switch (args->set_class) {
  182.      case FileBasicInformation:
  183. -        status = handle_nfs41_setattr(daemon_context, args);
  184. +        status = handle_nfs41_setattr_basicinfo(daemon_context, args);
  185.          break;
  186.      case FileDispositionInformation:
  187.          status = handle_nfs41_remove(daemon_context, args);
  188. --
  189. 2.45.1
  190.  
  191. From e61108b5d7a9f9a6e42033812108e15c840c975c Mon Sep 17 00:00:00 2001
  192. From: Roland Mainz <roland.mainz@nrubsig.org>
  193. Date: Mon, 4 Nov 2024 16:52:36 +0100
  194. Subject: [PATCH 3/4] daemon: |handle_nfs41_setattr_basicinfo()| asserts for
  195.  |FILE_ATTRIBUTE_EA|+|FILE_ATTRIBUTE_COMPRESSED|
  196.  
  197. Add asserts to |handle_nfs41_setattr_basicinfo()| to warn if someone tries
  198. to set |FILE_ATTRIBUTE_EA| and/or |FILE_ATTRIBUTE_COMPRESSED|.
  199.  
  200. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  201. ---
  202. daemon/setattr.c | 9 +++++++++
  203.  1 file changed, 9 insertions(+)
  204.  
  205. diff --git a/daemon/setattr.c b/daemon/setattr.c
  206. index 4f782c8..64e6b36 100644
  207. --- a/daemon/setattr.c
  208. +++ b/daemon/setattr.c
  209. @@ -94,6 +94,15 @@ static int handle_nfs41_setattr_basicinfo(void *daemon_context, setattr_upcall_a
  210.              info.attrmask.arr[1] = FATTR4_WORD1_SYSTEM;
  211.              info.attrmask.count = 2;
  212.          }
  213. +
  214. +        EASSERT_MSG(((basic_info->FileAttributes & FILE_ATTRIBUTE_EA) == 0),
  215. +            ("handle_nfs41_setattr_basicinfo(args->path='%s)': "
  216. +            "Unsupported flag FILE_ATTRIBUTE_EA ignored.\n",
  217. +            args->path));
  218. +        EASSERT_MSG(((basic_info->FileAttributes & FILE_ATTRIBUTE_COMPRESSED) == 0),
  219. +            ("handle_nfs41_setattr_basicinfo(args->path='%s)': "
  220. +            "Unsupported flag FILE_ATTRIBUTE_COMPRESSED ignored.\n",
  221. +            args->path));
  222.      }
  223.  
  224.      /* mode */
  225. --
  226. 2.45.1
  227.  
  228. From fef9bc082fa00d1c54464ba75219077830647a6c Mon Sep 17 00:00:00 2001
  229. From: Roland Mainz <roland.mainz@nrubsig.org>
  230. Date: Mon, 4 Nov 2024 17:12:22 +0100
  231. Subject: [PATCH 4/4] cygwin: Add src git bundle location to
  232.  README.bintarball.txt
  233.  
  234. Add src git bundle location
  235. ("/usr/src/msnfs41client/msnfs41client_git.bundle") to
  236. "README.bintarball.txt".
  237.  
  238. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  239. ---
  240. cygwin/README.bintarball.txt | 1 +
  241.  1 file changed, 1 insertion(+)
  242.  
  243. diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt
  244. index 1d24dec..7a6271b 100644
  245. --- a/cygwin/README.bintarball.txt
  246. +++ b/cygwin/README.bintarball.txt
  247. @@ -604,6 +604,7 @@ $ mount -t drvfs '\0.49.202.230@2049\nfs4\bigdisk' /mnt/bigdisk
  248.  # 12. Source code:
  249.  #
  250.  - Source code can be obtained from https://github.com/kofemann/ms-nfs41-client
  251. +  or as git bundle from /usr/src/msnfs41client/msnfs41client_git.bundle
  252.  
  253.  - Build instructions can be found at
  254.  https://github.com/kofemann/ms-nfs41-client/tree/master/cygwin
  255. --
  256. 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