0005-Fix-missing-macros-from-fcntl.h.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. From 6731272acf55de3bb82d186c0c7690211feb064a Mon Sep 17 00:00:00 2001
  2. From: Nick Kossifidis <mickflemm@gmail.com>
  3. Date: Sun, 4 Nov 2018 20:38:48 +0200
  4. Subject: [PATCH 5/5] Fix missing macros from fcntl.h
  5. This fixes file locking, tested with busybox
  6. ---
  7. arch/generic/bits/fcntl.h | 10 ++++++----
  8. include/fcntl.h | 2 ++
  9. 2 files changed, 8 insertions(+), 4 deletions(-)
  10. diff --git a/arch/generic/bits/fcntl.h b/arch/generic/bits/fcntl.h
  11. index ae233cc0..d9e779a6 100644
  12. --- a/arch/generic/bits/fcntl.h
  13. +++ b/arch/generic/bits/fcntl.h
  14. @@ -24,15 +24,17 @@
  15. #define F_SETFD 2
  16. #define F_GETFL 3
  17. #define F_SETFL 4
  18. -
  19. +#define F_GETLK 5
  20. +#define F_SETLK 6
  21. +#define F_SETLKW 7
  22. #define F_SETOWN 8
  23. #define F_GETOWN 9
  24. #define F_SETSIG 10
  25. #define F_GETSIG 11
  26. -#define F_GETLK 12
  27. -#define F_SETLK 13
  28. -#define F_SETLKW 14
  29. +#define F_GETLK64 12
  30. +#define F_SETLK64 13
  31. +#define F_SETLKW64 14
  32. #define F_SETOWN_EX 15
  33. #define F_GETOWN_EX 16
  34. diff --git a/include/fcntl.h b/include/fcntl.h
  35. index 4d91338b..c34de91f 100644
  36. --- a/include/fcntl.h
  37. +++ b/include/fcntl.h
  38. @@ -187,9 +187,11 @@ ssize_t tee(int, int, size_t, unsigned);
  39. #endif
  40. #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
  41. +#ifndef F_GETLK64
  42. #define F_GETLK64 F_GETLK
  43. #define F_SETLK64 F_SETLK
  44. #define F_SETLKW64 F_SETLKW
  45. +#endif
  46. #define flock64 flock
  47. #define open64 open
  48. #define openat64 openat
  49. --
  50. 2.20.1