[systemd-commits] 3 commits - Makefile.am src/libsystemd src/shared src/systemd
Daniel Mack
zonque at kemper.freedesktop.org
Mon Aug 18 03:37:36 PDT 2014
Makefile.am | 9
src/libsystemd/libsystemd.sym.m4 | 14 -
src/libsystemd/sd-bus/bus-kernel.c | 2
src/libsystemd/sd-bus/sd-memfd.c | 308 -----------------------------
src/libsystemd/sd-bus/test-bus-zero-copy.c | 2
src/shared/memfd.c | 308 +++++++++++++++++++++++++++++
src/shared/memfd.h | 57 +++++
src/shared/missing.h | 4
src/systemd/sd-bus.h | 2
src/systemd/sd-memfd.h | 57 -----
10 files changed, 372 insertions(+), 391 deletions(-)
New commits:
commit 4632777024b7ba210e4efe5cfabc8cd0b5991045
Author: Daniel Mack <zonque at gmail.com>
Date: Mon Aug 18 12:24:04 2014 +0200
memfd: fix memfd_create() syscall wrapper
Unlike earlier versions, the syscall only takes 2 arguments in its
final version, not 3.
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 4156b90..d384f84 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1121,7 +1121,7 @@ int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *mapped, size_t *al
if (!g)
return -ENOMEM;
- r = memfd_create(g, 0, MFD_ALLOW_SEALING);
+ r = memfd_create(g, MFD_ALLOW_SEALING);
if (r < 0)
return -errno;
diff --git a/src/shared/memfd.c b/src/shared/memfd.c
index 4dd70a2..dcebfc9 100644
--- a/src/shared/memfd.c
+++ b/src/shared/memfd.c
@@ -90,7 +90,7 @@ int sd_memfd_new(sd_memfd **m, const char *name) {
if (!n)
return -ENOMEM;
- n->fd = memfd_create(name, 0, MFD_ALLOW_SEALING);
+ n->fd = memfd_create(name, MFD_ALLOW_SEALING);
if (n->fd < 0) {
free(n);
return -errno;
diff --git a/src/shared/missing.h b/src/shared/missing.h
index 3a7e67e..3ff1a21 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -205,8 +205,8 @@ static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t ma
#endif
#ifndef HAVE_MEMFD_CREATE
-static inline int memfd_create(const char *name, uint64_t size, uint64_t flags) {
- return syscall(__NR_memfd_create, name, size, flags);
+static inline int memfd_create(const char *name, uint64_t flags) {
+ return syscall(__NR_memfd_create, name, flags);
}
#endif
commit 43bde981ccc57c744f164a9d95d46c7ce8f21808
Author: Daniel Mack <zonque at gmail.com>
Date: Mon Aug 18 10:55:49 2014 +0200
memfd: move code from public library to src/shared
Don't expose generic kernel API via libsystemd, but keep the code internal
for our own usage.
diff --git a/Makefile.am b/Makefile.am
index dbaed73..b9deaa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -860,6 +860,8 @@ libsystemd_shared_la_SOURCES = \
src/shared/copy.h \
src/shared/base-filesystem.c \
src/shared/base-filesystem.h \
+ src/shared/memfd.c \
+ src/shared/memfd.h \
src/shared/nss-util.h
nodist_libsystemd_shared_la_SOURCES = \
@@ -2382,7 +2384,6 @@ libsystemd_internal_la_SOURCES = \
src/systemd/sd-bus.h \
src/systemd/sd-bus-protocol.h \
src/systemd/sd-bus-vtable.h \
- src/systemd/sd-memfd.h \
src/systemd/sd-utf8.h \
src/systemd/sd-event.h \
src/systemd/sd-rtnl.h \
@@ -2432,7 +2433,6 @@ libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-bus/bus-slot.h \
src/libsystemd/sd-bus/bus-protocol.h \
src/libsystemd/sd-bus/kdbus.h \
- src/libsystemd/sd-bus/sd-memfd.c \
src/libsystemd/sd-utf8/sd-utf8.c \
src/libsystemd/sd-event/sd-event.c \
src/libsystemd/sd-event/event-util.h \
@@ -2550,7 +2550,6 @@ pkginclude_HEADERS += \
src/systemd/sd-bus.h \
src/systemd/sd-bus-protocol.h \
src/systemd/sd-bus-vtable.h \
- src/systemd/sd-memfd.h \
src/systemd/sd-utf8.h \
src/systemd/sd-event.h \
src/systemd/sd-rtnl.h \
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
index 1c24cad..415d89a 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -359,20 +359,6 @@ global:
sd_bus_track_first;
sd_bus_track_next;
- /* sd-memfd */
- sd_memfd_new;
- sd_memfd_new_and_map;
- sd_memfd_free;
- sd_memfd_get_fd;
- sd_memfd_get_file;
- sd_memfd_dup_fd;
- sd_memfd_map;
- sd_memfd_set_sealed;
- sd_memfd_get_sealed;
- sd_memfd_get_size;
- sd_memfd_set_size;
- sd_memfd_get_name;
-
/* sd-event */
sd_event_default;
sd_event_new;
diff --git a/src/libsystemd/sd-bus/sd-memfd.c b/src/libsystemd/sd-bus/sd-memfd.c
deleted file mode 100644
index 16d09e3..0000000
--- a/src/libsystemd/sd-bus/sd-memfd.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2013 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/prctl.h>
-
-#include "util.h"
-#include "bus-label.h"
-#include "missing.h"
-
-#include "sd-memfd.h"
-#include "sd-bus.h"
-
-struct sd_memfd {
- int fd;
- FILE *f;
-};
-
-_public_ int sd_memfd_new(sd_memfd **m, const char *name) {
-
- _cleanup_close_ int kdbus = -1;
- _cleanup_free_ char *g = NULL;
- sd_memfd *n;
-
- assert_return(m, -EINVAL);
-
- kdbus = open("/dev/kdbus/control", O_RDWR|O_NOCTTY|O_CLOEXEC);
- if (kdbus < 0)
- return -errno;
-
- if (name) {
- /* The kernel side is pretty picky about the character
- * set here, let's do the usual bus escaping to deal
- * with that. */
-
- g = bus_label_escape(name);
- if (!g)
- return -ENOMEM;
-
- name = g;
-
- } else {
- char pr[17] = {};
-
- /* If no name is specified we generate one. We include
- * a hint indicating our library implementation, and
- * add the thread name to it */
-
- assert_se(prctl(PR_GET_NAME, (unsigned long) pr) >= 0);
-
- if (isempty(pr))
- name = "sd";
- else {
- _cleanup_free_ char *e = NULL;
-
- e = bus_label_escape(pr);
- if (!e)
- return -ENOMEM;
-
- g = strappend("sd-", e);
- if (!g)
- return -ENOMEM;
-
- name = g;
- }
- }
-
- n = new0(struct sd_memfd, 1);
- if (!n)
- return -ENOMEM;
-
- n->fd = memfd_create(name, 0, MFD_ALLOW_SEALING);
- if (n->fd < 0) {
- free(n);
- return -errno;
- }
-
- *m = n;
- return 0;
-}
-
-_public_ int sd_memfd_new_from_fd(sd_memfd **m, int fd) {
- sd_memfd *n;
-
- assert_return(m, -EINVAL);
- assert_return(fd >= 0, -EINVAL);
-
- /* Check if this is a sealable fd */
- if (fcntl(fd, F_GET_SEALS) < 0)
- return -ENOTTY;
-
- n = new0(struct sd_memfd, 1);
- if (!n)
- return -ENOMEM;
-
- n->fd = fd;
- *m = n;
-
- return 0;
-}
-
-_public_ void sd_memfd_free(sd_memfd *m) {
- if (!m)
- return;
-
- if (m->f)
- fclose(m->f);
- else
- safe_close(m->fd);
-
- free(m);
-}
-
-_public_ int sd_memfd_get_fd(sd_memfd *m) {
- assert_return(m, -EINVAL);
-
- return m->fd;
-}
-
-_public_ int sd_memfd_get_file(sd_memfd *m, FILE **f) {
- assert_return(m, -EINVAL);
- assert_return(f, -EINVAL);
-
- if (!m->f) {
- m->f = fdopen(m->fd, "r+");
- if (!m->f)
- return -errno;
- }
-
- *f = m->f;
- return 0;
-}
-
-_public_ int sd_memfd_dup_fd(sd_memfd *m) {
- int fd;
-
- assert_return(m, -EINVAL);
-
- fd = fcntl(m->fd, F_DUPFD_CLOEXEC, 3);
- if (fd < 0)
- return -errno;
-
- return fd;
-}
-
-_public_ int sd_memfd_map(sd_memfd *m, uint64_t offset, size_t size, void **p) {
- void *q;
- int sealed;
-
- assert_return(m, -EINVAL);
- assert_return(size > 0, -EINVAL);
- assert_return(p, -EINVAL);
-
- sealed = sd_memfd_get_sealed(m);
- if (sealed < 0)
- return sealed;
-
- q = mmap(NULL, size, sealed ? PROT_READ : PROT_READ|PROT_WRITE, MAP_PRIVATE, m->fd, offset);
- if (q == MAP_FAILED)
- return -errno;
-
- *p = q;
- return 0;
-}
-
-_public_ int sd_memfd_set_sealed(sd_memfd *m) {
- int r;
-
- assert_return(m, -EINVAL);
-
- r = fcntl(m->fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
- if (r < 0)
- return -errno;
-
- return 0;
-}
-
-_public_ int sd_memfd_get_sealed(sd_memfd *m) {
- int r;
-
- assert_return(m, -EINVAL);
-
- r = fcntl(m->fd, F_GET_SEALS);
- if (r < 0)
- return -errno;
-
- return (r & (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)) ==
- (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
-}
-
-_public_ int sd_memfd_get_size(sd_memfd *m, uint64_t *sz) {
- int r;
- struct stat stat;
-
- assert_return(m, -EINVAL);
- assert_return(sz, -EINVAL);
-
- r = fstat(m->fd, &stat);
- if (r < 0)
- return -errno;
-
- *sz = stat.st_size;
- return r;
-}
-
-_public_ int sd_memfd_set_size(sd_memfd *m, uint64_t sz) {
- int r;
-
- assert_return(m, -EINVAL);
-
- r = ftruncate(m->fd, sz);
- if (r < 0)
- return -errno;
-
- return r;
-}
-
-_public_ int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p) {
- sd_memfd *n;
- int r;
-
- r = sd_memfd_new(&n, name);
- if (r < 0)
- return r;
-
- r = sd_memfd_set_size(n, sz);
- if (r < 0) {
- sd_memfd_free(n);
- return r;
- }
-
- r = sd_memfd_map(n, 0, sz, p);
- if (r < 0) {
- sd_memfd_free(n);
- return r;
- }
-
- *m = n;
- return 0;
-}
-
-_public_ int sd_memfd_get_name(sd_memfd *m, char **name) {
- char path[sizeof("/proc/self/fd/") + DECIMAL_STR_MAX(int)], buf[FILENAME_MAX+1], *e;
- const char *delim, *end;
- _cleanup_free_ char *n = NULL;
- ssize_t k;
-
- assert_return(m, -EINVAL);
- assert_return(name, -EINVAL);
-
- sprintf(path, "/proc/self/fd/%i", m->fd);
-
- k = readlink(path, buf, sizeof(buf));
- if (k < 0)
- return -errno;
-
- if ((size_t) k >= sizeof(buf))
- return -E2BIG;
-
- buf[k] = 0;
-
- delim = strstr(buf, ":[");
- if (!delim)
- return -EIO;
-
- delim = strchr(delim + 2, ':');
- if (!delim)
- return -EIO;
-
- delim++;
-
- end = strchr(delim, ']');
- if (!end)
- return -EIO;
-
- n = strndup(delim, end - delim);
- if (!n)
- return -ENOMEM;
-
- e = bus_label_unescape(n);
- if (!e)
- return -ENOMEM;
-
- *name = e;
-
- return 0;
-}
diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c
index 29e40aa..e4a87ab 100644
--- a/src/libsystemd/sd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/sd-bus/test-bus-zero-copy.c
@@ -24,9 +24,9 @@
#include "util.h"
#include "log.h"
+#include "memfd.h"
#include "sd-bus.h"
-#include "sd-memfd.h"
#include "bus-message.h"
#include "bus-error.h"
#include "bus-kernel.h"
diff --git a/src/shared/memfd.c b/src/shared/memfd.c
new file mode 100644
index 0000000..4dd70a2
--- /dev/null
+++ b/src/shared/memfd.c
@@ -0,0 +1,308 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/prctl.h>
+
+#include "util.h"
+#include "bus-label.h"
+#include "missing.h"
+#include "memfd.h"
+
+#include "sd-bus.h"
+
+struct sd_memfd {
+ int fd;
+ FILE *f;
+};
+
+int sd_memfd_new(sd_memfd **m, const char *name) {
+
+ _cleanup_close_ int kdbus = -1;
+ _cleanup_free_ char *g = NULL;
+ sd_memfd *n;
+
+ assert_return(m, -EINVAL);
+
+ kdbus = open("/dev/kdbus/control", O_RDWR|O_NOCTTY|O_CLOEXEC);
+ if (kdbus < 0)
+ return -errno;
+
+ if (name) {
+ /* The kernel side is pretty picky about the character
+ * set here, let's do the usual bus escaping to deal
+ * with that. */
+
+ g = bus_label_escape(name);
+ if (!g)
+ return -ENOMEM;
+
+ name = g;
+
+ } else {
+ char pr[17] = {};
+
+ /* If no name is specified we generate one. We include
+ * a hint indicating our library implementation, and
+ * add the thread name to it */
+
+ assert_se(prctl(PR_GET_NAME, (unsigned long) pr) >= 0);
+
+ if (isempty(pr))
+ name = "sd";
+ else {
+ _cleanup_free_ char *e = NULL;
+
+ e = bus_label_escape(pr);
+ if (!e)
+ return -ENOMEM;
+
+ g = strappend("sd-", e);
+ if (!g)
+ return -ENOMEM;
+
+ name = g;
+ }
+ }
+
+ n = new0(struct sd_memfd, 1);
+ if (!n)
+ return -ENOMEM;
+
+ n->fd = memfd_create(name, 0, MFD_ALLOW_SEALING);
+ if (n->fd < 0) {
+ free(n);
+ return -errno;
+ }
+
+ *m = n;
+ return 0;
+}
+
+int sd_memfd_new_from_fd(sd_memfd **m, int fd) {
+ sd_memfd *n;
+
+ assert_return(m, -EINVAL);
+ assert_return(fd >= 0, -EINVAL);
+
+ /* Check if this is a sealable fd */
+ if (fcntl(fd, F_GET_SEALS) < 0)
+ return -ENOTTY;
+
+ n = new0(struct sd_memfd, 1);
+ if (!n)
+ return -ENOMEM;
+
+ n->fd = fd;
+ *m = n;
+
+ return 0;
+}
+
+void sd_memfd_free(sd_memfd *m) {
+ if (!m)
+ return;
+
+ if (m->f)
+ fclose(m->f);
+ else
+ safe_close(m->fd);
+
+ free(m);
+}
+
+int sd_memfd_get_fd(sd_memfd *m) {
+ assert_return(m, -EINVAL);
+
+ return m->fd;
+}
+
+int sd_memfd_get_file(sd_memfd *m, FILE **f) {
+ assert_return(m, -EINVAL);
+ assert_return(f, -EINVAL);
+
+ if (!m->f) {
+ m->f = fdopen(m->fd, "r+");
+ if (!m->f)
+ return -errno;
+ }
+
+ *f = m->f;
+ return 0;
+}
+
+int sd_memfd_dup_fd(sd_memfd *m) {
+ int fd;
+
+ assert_return(m, -EINVAL);
+
+ fd = fcntl(m->fd, F_DUPFD_CLOEXEC, 3);
+ if (fd < 0)
+ return -errno;
+
+ return fd;
+}
+
+int sd_memfd_map(sd_memfd *m, uint64_t offset, size_t size, void **p) {
+ void *q;
+ int sealed;
+
+ assert_return(m, -EINVAL);
+ assert_return(size > 0, -EINVAL);
+ assert_return(p, -EINVAL);
+
+ sealed = sd_memfd_get_sealed(m);
+ if (sealed < 0)
+ return sealed;
+
+ q = mmap(NULL, size, sealed ? PROT_READ : PROT_READ|PROT_WRITE, MAP_PRIVATE, m->fd, offset);
+ if (q == MAP_FAILED)
+ return -errno;
+
+ *p = q;
+ return 0;
+}
+
+int sd_memfd_set_sealed(sd_memfd *m) {
+ int r;
+
+ assert_return(m, -EINVAL);
+
+ r = fcntl(m->fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
+ if (r < 0)
+ return -errno;
+
+ return 0;
+}
+
+int sd_memfd_get_sealed(sd_memfd *m) {
+ int r;
+
+ assert_return(m, -EINVAL);
+
+ r = fcntl(m->fd, F_GET_SEALS);
+ if (r < 0)
+ return -errno;
+
+ return (r & (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)) ==
+ (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
+}
+
+int sd_memfd_get_size(sd_memfd *m, uint64_t *sz) {
+ int r;
+ struct stat stat;
+
+ assert_return(m, -EINVAL);
+ assert_return(sz, -EINVAL);
+
+ r = fstat(m->fd, &stat);
+ if (r < 0)
+ return -errno;
+
+ *sz = stat.st_size;
+ return r;
+}
+
+int sd_memfd_set_size(sd_memfd *m, uint64_t sz) {
+ int r;
+
+ assert_return(m, -EINVAL);
+
+ r = ftruncate(m->fd, sz);
+ if (r < 0)
+ return -errno;
+
+ return r;
+}
+
+int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p) {
+ sd_memfd *n;
+ int r;
+
+ r = sd_memfd_new(&n, name);
+ if (r < 0)
+ return r;
+
+ r = sd_memfd_set_size(n, sz);
+ if (r < 0) {
+ sd_memfd_free(n);
+ return r;
+ }
+
+ r = sd_memfd_map(n, 0, sz, p);
+ if (r < 0) {
+ sd_memfd_free(n);
+ return r;
+ }
+
+ *m = n;
+ return 0;
+}
+
+int sd_memfd_get_name(sd_memfd *m, char **name) {
+ char path[sizeof("/proc/self/fd/") + DECIMAL_STR_MAX(int)], buf[FILENAME_MAX+1], *e;
+ const char *delim, *end;
+ _cleanup_free_ char *n = NULL;
+ ssize_t k;
+
+ assert_return(m, -EINVAL);
+ assert_return(name, -EINVAL);
+
+ sprintf(path, "/proc/self/fd/%i", m->fd);
+
+ k = readlink(path, buf, sizeof(buf));
+ if (k < 0)
+ return -errno;
+
+ if ((size_t) k >= sizeof(buf))
+ return -E2BIG;
+
+ buf[k] = 0;
+
+ delim = strstr(buf, ":[");
+ if (!delim)
+ return -EIO;
+
+ delim = strchr(delim + 2, ':');
+ if (!delim)
+ return -EIO;
+
+ delim++;
+
+ end = strchr(delim, ']');
+ if (!end)
+ return -EIO;
+
+ n = strndup(delim, end - delim);
+ if (!n)
+ return -ENOMEM;
+
+ e = bus_label_unescape(n);
+ if (!e)
+ return -ENOMEM;
+
+ *name = e;
+
+ return 0;
+}
diff --git a/src/shared/memfd.h b/src/shared/memfd.h
new file mode 100644
index 0000000..6de045c
--- /dev/null
+++ b/src/shared/memfd.h
@@ -0,0 +1,57 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef foosdmemfdhfoo
+#define foosdmemfdhfoo
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <inttypes.h>
+#include <sys/types.h>
+#include <stdio.h>
+
+#include "_sd-common.h"
+
+_SD_BEGIN_DECLARATIONS;
+
+typedef struct sd_memfd sd_memfd;
+
+int sd_memfd_new(sd_memfd **m, const char *name);
+int sd_memfd_new_from_fd(sd_memfd **m, int fd);
+int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p);
+
+void sd_memfd_free(sd_memfd *m);
+
+int sd_memfd_get_fd(sd_memfd *m);
+int sd_memfd_dup_fd(sd_memfd *n);
+int sd_memfd_get_file(sd_memfd *m, FILE **f);
+
+int sd_memfd_map(sd_memfd *m, uint64_t offset, size_t size, void **p);
+
+int sd_memfd_set_sealed(sd_memfd *m);
+int sd_memfd_get_sealed(sd_memfd *m);
+
+int sd_memfd_get_size(sd_memfd *m, uint64_t *sz);
+int sd_memfd_set_size(sd_memfd *m, uint64_t sz);
+
+int sd_memfd_get_name(sd_memfd *m, char **name);
+
+_SD_END_DECLARATIONS;
+
+#endif
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 3eedb44..a69cafb 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -28,7 +28,7 @@
#include "sd-id128.h"
#include "sd-event.h"
-#include "sd-memfd.h"
+#include "memfd.h"
#include "_sd-common.h"
_SD_BEGIN_DECLARATIONS;
diff --git a/src/systemd/sd-memfd.h b/src/systemd/sd-memfd.h
deleted file mode 100644
index 6de045c..0000000
--- a/src/systemd/sd-memfd.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foosdmemfdhfoo
-#define foosdmemfdhfoo
-
-/***
- This file is part of systemd.
-
- Copyright 2013 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "_sd-common.h"
-
-_SD_BEGIN_DECLARATIONS;
-
-typedef struct sd_memfd sd_memfd;
-
-int sd_memfd_new(sd_memfd **m, const char *name);
-int sd_memfd_new_from_fd(sd_memfd **m, int fd);
-int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p);
-
-void sd_memfd_free(sd_memfd *m);
-
-int sd_memfd_get_fd(sd_memfd *m);
-int sd_memfd_dup_fd(sd_memfd *n);
-int sd_memfd_get_file(sd_memfd *m, FILE **f);
-
-int sd_memfd_map(sd_memfd *m, uint64_t offset, size_t size, void **p);
-
-int sd_memfd_set_sealed(sd_memfd *m);
-int sd_memfd_get_sealed(sd_memfd *m);
-
-int sd_memfd_get_size(sd_memfd *m, uint64_t *sz);
-int sd_memfd_set_size(sd_memfd *m, uint64_t sz);
-
-int sd_memfd_get_name(sd_memfd *m, char **name);
-
-_SD_END_DECLARATIONS;
-
-#endif
commit 93bd9b2ecfdafcf0bd895336634c40d68b06d54e
Author: Daniel Mack <zonque at gmail.com>
Date: Mon Aug 18 10:45:49 2014 +0200
Makefile.am: test-bus-memfd went away. Kill its residues in Makefile.am
diff --git a/Makefile.am b/Makefile.am
index cfa51cc..dbaed73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2724,10 +2724,6 @@ test_bus_kernel_benchmark_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
-test_bus_memfd_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
-
test_bus_zero_copy_SOURCES = \
src/libsystemd/sd-bus/test-bus-zero-copy.c
More information about the systemd-commits
mailing list