Skip to content

use fstatfs to detect whether current file system supports shared locks for files opened for writing #55256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamsitnik merged 16 commits into from
Jul 9, 2021
Merged

use fstatfs to detect whether current file system supports shared locks for files opened for writing #55256

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
71d131a
use fstatfs to detect whether current file system supports shared loc…
adamsitnik Jul 7, 2021
7980cc8
improve comments
adamsitnik Jul 7, 2021
97c1544
cast in explicit way
adamsitnik Jul 7, 2021
5d95af8
hopefully fix the BSD build(s)
adamsitnik Jul 7, 2021
d64374f
fix OSX build
adamsitnik Jul 7, 2021
c687e6a
assume we should not acquire the lock if we don't know the File System
adamsitnik Jul 7, 2021
9c481ed
try to fix the maccatalyst build
adamsitnik Jul 7, 2021
1c890ec
always use fstatfs as it's available on every platform and can get us…
adamsitnik Jul 8, 2021
04eced6
handle SMB2_SUPER_MAGIC as well (#53182)
adamsitnik Jul 8, 2021
79b6def
introduce a flag that allows to disable file locking on Unix
adamsitnik Jul 8, 2021
ba6d027
Emscripten does not support file locking, so there is no need to chec…
adamsitnik Jul 8, 2021
731e65c
some polishing
adamsitnik Jul 8, 2021
d31f6e1
Merge remote-tracking branch 'upstream/main' into superMagic
adamsitnik Jul 8, 2021
c752b93
reuse the UnixFileSystemTypes enum, move it to a separate file so Cor…
adamsitnik Jul 9, 2021
7443a5e
add SMB2_SUPER_MAGIC to the enum
adamsitnik Jul 9, 2021
1e3878c
don't try to unlock the file if it has not been locked
adamsitnik Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
always use fstatfs as it's available on every platform and can get us… 
…e correct file system type
  • Loading branch information
@adamsitnik
adamsitnik committed Jul 8, 2021
commit 1c890ec8f6e949df45ef5388b3925c8dab0820f8
2 changes: 0 additions & 2 deletions src/libraries/Native/Unix/Common/pal_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
#cmakedefine01 HAVE_MMAP64
#cmakedefine01 HAVE_FTRUNCATE64
#cmakedefine01 HAVE_POSIX_FADVISE64
#cmakedefine01 HAVE_STATFS64_VFS
#cmakedefine01 HAVE_STATFS64_MOUNT
#cmakedefine01 HAVE_STATFS_VFS
#cmakedefine01 HAVE_STATFS_MOUNT
#cmakedefine01 HAVE_FLOCK64
Expand Down
19 changes: 7 additions & 12 deletions src/libraries/Native/Unix/System.Native/pal_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
#if HAVE_INOTIFY
#include <sys/inotify.h>
#endif
#if HAVE_STATFS64_VFS || HAVE_STATFS_VFS // Linux
#if HAVE_STATFS_VFS // Linux
#include <sys/vfs.h>
#elif HAVE_STATFS64_MOUNT || HAVE_STATFS_MOUNT // BSD
#elif HAVE_STATFS_MOUNT // BSD
#include <sys/mount.h>
#endif

Expand Down Expand Up @@ -1386,21 +1386,16 @@ static int16_t ConvertLockType(int16_t managedLockType)

int64_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
int statfsRes;
#if HAVE_STATFS_MOUNT && (defined(TARGET_IOS) || defined(TARGET_OSX) || defined(TARGET_WATCHOS) || defined(TARGET_TVOS) || defined(HOST_MACCAT)) // In macOS 10.6+ statfs64 is deprecated, in favor of statfs
struct statfs statfsArgs;
while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
#elif HAVE_STATFS64_VFS || HAVE_STATFS64_MOUNT
struct statfs64 statfsArgs;
while ((statfsRes = fstatfs64(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
#elif HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
struct statfs statfsArgs;
// for our needs (get file system type) statfs is always enough and there is no need to use statfs64
// which got deprecated in macOS 10.6, in favor of statfs
while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
#else
#error "Platform doesn't support fstatfs64 or fstatfs"
#error "Platform doesn't support fstatfs"
#endif

return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
}

int32_t SystemNative_LockFileRegion(intptr_t fd, int64_t offset, int64_t length, int16_t lockType)
Expand Down
22 changes: 0 additions & 22 deletions src/libraries/Native/Unix/configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,6 @@ check_c_source_compiles(

# /in_pktinfo

check_c_source_compiles(
"
#include <sys/vfs.h>
int main(void)
{
struct statfs64 s;
return 0;
}
"
HAVE_STATFS64_VFS)

check_c_source_compiles(
"
#include <sys/vfs.h>
Expand All @@ -130,17 +119,6 @@ check_c_source_compiles(
"
HAVE_STATFS_VFS)

check_c_source_compiles(
"
#include <sys/mount.h>
int main(void)
{
struct statfs64 s;
return 0;
}
"
HAVE_STATFS64_MOUNT)

check_c_source_compiles(
"
#include <sys/mount.h>
Expand Down