aboutsummaryrefslogtreecommitdiff
path: root/net/glusterfs/files/patch-libglusterfs_src_syscall.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/glusterfs/files/patch-libglusterfs_src_syscall.c')
-rw-r--r--net/glusterfs/files/patch-libglusterfs_src_syscall.c70
1 files changed, 0 insertions, 70 deletions
diff --git a/net/glusterfs/files/patch-libglusterfs_src_syscall.c b/net/glusterfs/files/patch-libglusterfs_src_syscall.c
deleted file mode 100644
index ad4c70893dbd..000000000000
--- a/net/glusterfs/files/patch-libglusterfs_src_syscall.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- libglusterfs/src/syscall.c.orig 2020-08-04 12:41:32 UTC
-+++ libglusterfs/src/syscall.c
-@@ -13,6 +13,10 @@
- #include "glusterfs/mem-pool.h"
- #include "glusterfs/libglusterfs-messages.h"
-
-+#ifdef __FreeBSD__
-+#include <sys/sysctl.h>
-+#include <signal.h>
-+#endif
- #include <sys/types.h>
- #include <utime.h>
- #include <sys/time.h>
-@@ -506,9 +510,17 @@ sys_lsetxattr(const char *path, const char *name, cons
- #endif
-
- #ifdef GF_BSD_HOST_OS
-- return FS_RET_CHECK0(
-+ ssize_t ret = FS_RET_CHECK(
- extattr_set_link(path, EXTATTR_NAMESPACE_USER, name, value, size),
- errno);
-+ /* On BSD extattr_set_link returns the number of bytes written/read on
-+ * success. Force this to be 0 if it was successful so the result remains
-+ * compatible with other platform expectations.
-+ */
-+ if(ret > 0) {
-+ ret = 0;
-+ }
-+ return ret;
- #endif
-
- #ifdef GF_SOLARIS_HOST_OS
-@@ -624,9 +636,17 @@ sys_fsetxattr(int filedes, const char *name, const voi
- #endif
-
- #ifdef GF_BSD_HOST_OS
-- return FS_RET_CHECK0(
-+ ssize_t ret = FS_RET_CHECK(
- extattr_set_fd(filedes, EXTATTR_NAMESPACE_USER, name, value, size),
- errno);
-+ /* On BSD extattr_set_fd returns the number of bytes written/read on
-+ * success. Force this to be 0 if it was successful so the result remains
-+ * compatible with other platform expectations.
-+ */
-+ if(ret > 0) {
-+ ret = 0;
-+ }
-+ return ret;
- #endif
-
- #ifdef GF_SOLARIS_HOST_OS
-@@ -854,3 +874,18 @@ sys_copy_file_range(int fd_in, off64_t *off_in, int fd
- #endif /* HAVE_COPY_FILE_RANGE_SYS */
- #endif /* HAVE_COPY_FILE_RANGE */
- }
-+
-+#ifdef __FreeBSD__
-+int
-+sys_kill(pid_t pid, int sig)
-+{
-+ return FS_RET_CHECK0(kill(pid, sig), errno);
-+}
-+
-+int
-+sys_sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp,
-+ const void *newp, size_t newlen)
-+{
-+ return FS_RET_CHECK0(sysctl(name, namelen, oldp, oldlenp, newp, newlen), errno);
-+}
-+#endif