common/ConfUtils.cc \
common/MemoryModel.cc \
common/armor.c \
- common/ceph_extattr.c \
+ common/xattr.c \
common/safe_io.c \
common/str_list.cc \
common/errno.cc \
common/WorkQueue.h\
common/ceph_argparse.h\
common/ceph_context.h\
- common/ceph_extattr.h\
+ common/xattr.h\
common/compiler_extensions.h\
common/debug.h\
common/dout.h\
+++ /dev/null
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2011 Stanislav Sedov <stas@FreeBSD.org>
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software
- * Foundation. See file COPYING.
- */
-
-#if defined(__FreeBSD__)
-#include <errno.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <sys/extattr.h>
-#elif defined(__linux__)
-#include <sys/types.h>
-#include <sys/xattr.h>
-#elif defined(DARWIN)
-#include <sys/xattr.h>
-#else
-#error "Your system is not supported!"
-#endif
-
-#include "common/ceph_extattr.h"
-
-/*
- * Sets extended attribute on a file.
- * Returns 0 on success, -1 on failure.
- */
-int
-ceph_os_setxattr(const char *path, const char *name,
- const void *value, size_t size)
-{
- int error = -1;
-
-#if defined(__FreeBSD__)
- error = extattr_set_file(path, EXTATTR_NAMESPACE_USER, name, value,
- size);
- if (error > 0)
- error = 0;
-#elif defined(__linux__) || defined(DARWIN)
- error = setxattr(path, name, value, size, 0);
-#endif
-
- return (error);
-}
-
-int
-ceph_os_fsetxattr(int fd, const char *name, const void *value,
- size_t size)
-{
- int error = -1;
-
-#if defined(__FreeBSD__)
- error = extattr_set_fd(fd, EXTATTR_NAMESPACE_USER, name, value,
- size);
- if (error > 0)
- error = 0;
-#elif defined(__linux__) || defined(DARWIN)
- error = fsetxattr(fd, name, value, size, 0);
-#endif
-
- return (error);
-}
-
-ssize_t
-ceph_os_getxattr(const char *path, const char *name,
-void *value, size_t size)
-{
- ssize_t error = -1;
-
-#if defined(__FreeBSD__)
- if (value == NULL || size == 0) {
- error = extattr_get_file(path, EXTATTR_NAMESPACE_USER, name, value,
- size);
- } else {
- error = extattr_get_file(path, EXTATTR_NAMESPACE_USER, name, NULL,
- 0);
- if (error > 0) {
- if (error > size) {
- errno = ERANGE;
- error = -1;
- } else {
- error = extattr_get_file(path, EXTATTR_NAMESPACE_USER,
- name, value, size);
- }
- }
- }
-#elif defined(__linux__)
- error = getxattr(path, name, value, size);
-#elif defined(DARWIN)
- error = getxattr(path, name, value, size, 0);
-#endif
-
- return (error);
-}
-
-ssize_t
-ceph_os_fgetxattr(int fd, const char *name, void *value,
- size_t size)
-{
- ssize_t error = -1;
-
-#if defined(__FreeBSD__)
- if (value == NULL || size == 0) {
- error = extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, name, value,
- size);
- } else {
- error = extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, name, NULL,
- 0);
- if (error > 0) {
- if (error > size) {
- errno = ERANGE;
- error = -1;
- } else {
- error = extattr_get_fd(fd, EXTATTR_NAMESPACE_USER,
- name, value, size);
- }
- }
- }
-#elif defined(__linux__)
- error = fgetxattr(fd, name, value, size);
-#elif defined(DARWIN)
- error = fgetxattr(fd, name, value, size, 0);
-#endif
-
- return (error);
-}
-
-ssize_t
-ceph_os_listxattr(const char *path, char *list, size_t size)
-{
- ssize_t error = -1;
-
-#if defined(__FreeBSD__)
- /*
- * XXX. The format of the list FreeBSD returns differs
- * from the Linux ones. We have to perform the conversion. :-(
- */
- char *newlist, *p, *p1;
-
- if (size != 0) {
- newlist = malloc(size);
- if (newlist != NULL) {
- error = extattr_list_file(path, EXTATTR_NAMESPACE_USER,
- newlist, size);
- if (error > 0) {
- p = newlist;
- p1 = list;
- while ((p - newlist) < error) {
- uint8_t len = *(uint8_t *)p;
- p++;
- if ((p + len - newlist) > error)
- break;
- if (len > 0) {
- bcopy(p, p1, len);
- p += len;
- p1 += len;
- *p1++ = '\0';
- }
- }
- error = p1 - list;
- }
- free(newlist);
- }
- } else {
- error = extattr_list_file(path, EXTATTR_NAMESPACE_USER,
- list, size);
- }
-#elif defined(__linux__)
- error = listxattr(path, list, size);
-#elif defined(DARWIN)
- error = listxattr(path, list, size, 0);
-#endif
-
- return (error);
-}
-
-ssize_t
-ceph_os_flistxattr(int fd, char *list, size_t size)
-{
- ssize_t error = -1;
-
-#if defined(__FreeBSD__)
- /*
- * XXX. The format of the list FreeBSD returns differs
- * from the Linux ones. We have to perform the conversion. :-(
- */
- char *newlist, *p, *p1;
-
- if (size != 0) {
- newlist = malloc(size);
- if (newlist != NULL) {
- error = extattr_list_fd(fd, EXTATTR_NAMESPACE_USER,
- newlist, size);
- if (error > 0) {
- p = newlist;
- p1 = list;
- while ((p - newlist) < error) {
- uint8_t len = *(uint8_t *)p;
- p++;
- if ((p + len - newlist) > error)
- break;
- if (len > 0) {
- bcopy(p, p1, len);
- p += len;
- p1 += len;
- *p1++ = '\0';
- }
- }
- error = p1 - list;
- }
- free(newlist);
- }
- } else {
- error = extattr_list_fd(fd, EXTATTR_NAMESPACE_USER,
- list, size);
- }
-#elif defined(__linux__)
- error = flistxattr(fd, list, size);
-#elif defined(DARWIN)
- error = flistxattr(fd, list, size, 0);
-#endif
-
- return (error);
-}
-
-int
-ceph_os_removexattr(const char *path, const char *name)
-{
- int error = -1;
-
-#if defined(__FreeBSD__)
- error = extattr_delete_file(path, EXTATTR_NAMESPACE_USER, name);
-#elif defined(__linux__)
- error = removexattr(path, name);
-#elif defined(DARWIN)
- error = removexattr(path, name, 0);
-#endif
-
- return (error);
-}
-
-int
-ceph_os_fremovexattr(int fd, const char *name)
-{
- int error = -1;
-
-#if defined(__FreeBSD__)
- error = extattr_delete_fd(fd, EXTATTR_NAMESPACE_USER, name);
-#elif defined(__linux__)
- error = fremovexattr(fd, name);
-#elif defined(DARWIN)
- error = fremovexattr(fd, name, 0);
-#endif
-
- return (error);
-}
+++ /dev/null
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2011 Stanislav Sedov <stas@FreeBSD.org>
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software
- * Foundation. See file COPYING.
- */
-
-#ifndef CEPH_EXTATTR_H
-#define CEPH_EXTATTR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int ceph_os_setxattr(const char *path, const char *name,
- const void *value, size_t size);
-int ceph_os_fsetxattr(int fd, const char *name, const void *value,
- size_t size);
-ssize_t ceph_os_getxattr(const char *path, const char *name,
- void *value, size_t size);
-ssize_t ceph_os_fgetxattr(int fd, const char *name, void *value,
- size_t size);
-ssize_t ceph_os_listxattr(const char *path, char *list, size_t size);
-ssize_t ceph_os_flistxattr(int fd, char *list, size_t size);
-int ceph_os_removexattr(const char *path, const char *name);
-int ceph_os_fremovexattr(int fd, const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !CEPH_EXTATTR_H */
--- /dev/null
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2011 Stanislav Sedov <stas@FreeBSD.org>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation. See file COPYING.
+ */
+
+#if defined(__FreeBSD__)
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <sys/extattr.h>
+#elif defined(__linux__)
+#include <sys/types.h>
+#include <sys/xattr.h>
+#elif defined(DARWIN)
+#include <sys/xattr.h>
+#else
+#error "Your system is not supported!"
+#endif
+
+#include "common/xattr.h"
+
+/*
+ * Sets extended attribute on a file.
+ * Returns 0 on success, -1 on failure.
+ */
+int
+ceph_os_setxattr(const char *path, const char *name,
+ const void *value, size_t size)
+{
+ int error = -1;
+
+#if defined(__FreeBSD__)
+ error = extattr_set_file(path, EXTATTR_NAMESPACE_USER, name, value,
+ size);
+ if (error > 0)
+ error = 0;
+#elif defined(__linux__) || defined(DARWIN)
+ error = setxattr(path, name, value, size, 0);
+#endif
+
+ return (error);
+}
+
+int
+ceph_os_fsetxattr(int fd, const char *name, const void *value,
+ size_t size)
+{
+ int error = -1;
+
+#if defined(__FreeBSD__)
+ error = extattr_set_fd(fd, EXTATTR_NAMESPACE_USER, name, value,
+ size);
+ if (error > 0)
+ error = 0;
+#elif defined(__linux__) || defined(DARWIN)
+ error = fsetxattr(fd, name, value, size, 0);
+#endif
+
+ return (error);
+}
+
+ssize_t
+ceph_os_getxattr(const char *path, const char *name,
+void *value, size_t size)
+{
+ ssize_t error = -1;
+
+#if defined(__FreeBSD__)
+ if (value == NULL || size == 0) {
+ error = extattr_get_file(path, EXTATTR_NAMESPACE_USER, name, value,
+ size);
+ } else {
+ error = extattr_get_file(path, EXTATTR_NAMESPACE_USER, name, NULL,
+ 0);
+ if (error > 0) {
+ if (error > size) {
+ errno = ERANGE;
+ error = -1;
+ } else {
+ error = extattr_get_file(path, EXTATTR_NAMESPACE_USER,
+ name, value, size);
+ }
+ }
+ }
+#elif defined(__linux__)
+ error = getxattr(path, name, value, size);
+#elif defined(DARWIN)
+ error = getxattr(path, name, value, size, 0);
+#endif
+
+ return (error);
+}
+
+ssize_t
+ceph_os_fgetxattr(int fd, const char *name, void *value,
+ size_t size)
+{
+ ssize_t error = -1;
+
+#if defined(__FreeBSD__)
+ if (value == NULL || size == 0) {
+ error = extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, name, value,
+ size);
+ } else {
+ error = extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, name, NULL,
+ 0);
+ if (error > 0) {
+ if (error > size) {
+ errno = ERANGE;
+ error = -1;
+ } else {
+ error = extattr_get_fd(fd, EXTATTR_NAMESPACE_USER,
+ name, value, size);
+ }
+ }
+ }
+#elif defined(__linux__)
+ error = fgetxattr(fd, name, value, size);
+#elif defined(DARWIN)
+ error = fgetxattr(fd, name, value, size, 0);
+#endif
+
+ return (error);
+}
+
+ssize_t
+ceph_os_listxattr(const char *path, char *list, size_t size)
+{
+ ssize_t error = -1;
+
+#if defined(__FreeBSD__)
+ /*
+ * XXX. The format of the list FreeBSD returns differs
+ * from the Linux ones. We have to perform the conversion. :-(
+ */
+ char *newlist, *p, *p1;
+
+ if (size != 0) {
+ newlist = malloc(size);
+ if (newlist != NULL) {
+ error = extattr_list_file(path, EXTATTR_NAMESPACE_USER,
+ newlist, size);
+ if (error > 0) {
+ p = newlist;
+ p1 = list;
+ while ((p - newlist) < error) {
+ uint8_t len = *(uint8_t *)p;
+ p++;
+ if ((p + len - newlist) > error)
+ break;
+ if (len > 0) {
+ bcopy(p, p1, len);
+ p += len;
+ p1 += len;
+ *p1++ = '\0';
+ }
+ }
+ error = p1 - list;
+ }
+ free(newlist);
+ }
+ } else {
+ error = extattr_list_file(path, EXTATTR_NAMESPACE_USER,
+ list, size);
+ }
+#elif defined(__linux__)
+ error = listxattr(path, list, size);
+#elif defined(DARWIN)
+ error = listxattr(path, list, size, 0);
+#endif
+
+ return (error);
+}
+
+ssize_t
+ceph_os_flistxattr(int fd, char *list, size_t size)
+{
+ ssize_t error = -1;
+
+#if defined(__FreeBSD__)
+ /*
+ * XXX. The format of the list FreeBSD returns differs
+ * from the Linux ones. We have to perform the conversion. :-(
+ */
+ char *newlist, *p, *p1;
+
+ if (size != 0) {
+ newlist = malloc(size);
+ if (newlist != NULL) {
+ error = extattr_list_fd(fd, EXTATTR_NAMESPACE_USER,
+ newlist, size);
+ if (error > 0) {
+ p = newlist;
+ p1 = list;
+ while ((p - newlist) < error) {
+ uint8_t len = *(uint8_t *)p;
+ p++;
+ if ((p + len - newlist) > error)
+ break;
+ if (len > 0) {
+ bcopy(p, p1, len);
+ p += len;
+ p1 += len;
+ *p1++ = '\0';
+ }
+ }
+ error = p1 - list;
+ }
+ free(newlist);
+ }
+ } else {
+ error = extattr_list_fd(fd, EXTATTR_NAMESPACE_USER,
+ list, size);
+ }
+#elif defined(__linux__)
+ error = flistxattr(fd, list, size);
+#elif defined(DARWIN)
+ error = flistxattr(fd, list, size, 0);
+#endif
+
+ return (error);
+}
+
+int
+ceph_os_removexattr(const char *path, const char *name)
+{
+ int error = -1;
+
+#if defined(__FreeBSD__)
+ error = extattr_delete_file(path, EXTATTR_NAMESPACE_USER, name);
+#elif defined(__linux__)
+ error = removexattr(path, name);
+#elif defined(DARWIN)
+ error = removexattr(path, name, 0);
+#endif
+
+ return (error);
+}
+
+int
+ceph_os_fremovexattr(int fd, const char *name)
+{
+ int error = -1;
+
+#if defined(__FreeBSD__)
+ error = extattr_delete_fd(fd, EXTATTR_NAMESPACE_USER, name);
+#elif defined(__linux__)
+ error = fremovexattr(fd, name);
+#elif defined(DARWIN)
+ error = fremovexattr(fd, name, 0);
+#endif
+
+ return (error);
+}
--- /dev/null
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2011 Stanislav Sedov <stas@FreeBSD.org>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation. See file COPYING.
+ */
+
+#ifndef CEPH_EXTATTR_H
+#define CEPH_EXTATTR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int ceph_os_setxattr(const char *path, const char *name,
+ const void *value, size_t size);
+int ceph_os_fsetxattr(int fd, const char *name, const void *value,
+ size_t size);
+ssize_t ceph_os_getxattr(const char *path, const char *name,
+ void *value, size_t size);
+ssize_t ceph_os_fgetxattr(int fd, const char *name, void *value,
+ size_t size);
+ssize_t ceph_os_listxattr(const char *path, char *list, size_t size);
+ssize_t ceph_os_flistxattr(int fd, char *list, size_t size);
+int ceph_os_removexattr(const char *path, const char *name);
+int ceph_os_fremovexattr(int fd, const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !CEPH_EXTATTR_H */
#include "include/compat.h"
#include "include/fiemap.h"
-#include "common/ceph_extattr.h"
+#include "common/xattr.h"
#if defined(DARWIN) || defined(__FreeBSD__)
#include <sys/param.h>
#include <unistd.h>
#include "include/compat.h"
-#include "common/ceph_extattr.h"
+#include "common/xattr.h"
using namespace librados;
#include "rados_sync.h"
#include "include/compat.h"
-#include "common/ceph_extattr.h"
+#include "common/xattr.h"
#include <dirent.h>
#include <errno.h>
projects / ceph.git / commitdiff