]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: rename ceph_statx.h to ceph_ll_client.h
authorJeff Layton <jlayton@redhat.com>
Thu, 16 Apr 2020 16:01:05 +0000 (12:01 -0400)
committerVicente Cheng <freeze.bilsted@gmail.com>
Wed, 20 May 2020 08:42:00 +0000 (08:42 +0000)
...so we can use it to include other definitions and types that need to
be shared with in-tree code that doesn't want to include libcephfs.h.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 4436f27a0476e96d10ed3367d738e1679d8b0a38)

alpine/APKBUILD.in
ceph.spec.in
debian/libcephfs-dev.install
src/client/Client.cc
src/client/Client.h
src/client/SyntheticClient.cc
src/client/fuse_ll.cc
src/include/cephfs/ceph_ll_client.h [new file with mode: 0644]
src/include/cephfs/ceph_statx.h [deleted file]
src/include/cephfs/libcephfs.h
src/pybind/cephfs/cephfs.pyx

index 7a3b598b758b8dc7c5ab00749017866d6781fae6..9348f9ccf91474f5d334bb8c36b83de48b6f8343 100644 (file)
@@ -396,7 +396,7 @@ libcephfs_dev() {
        pkgdesc="Ceph distributed file system client library headers"
        depends="libcephfs librados-devel"
 
-       _pkg $_includedir/cephfs ceph_statx.h libcephfs.h
+       _pkg $_includedir/cephfs ceph_ll_client.h libcephfs.h
        _pkg $_libdir libcephfs.so
 }
 
index 2d20cd2bcb7bc7f6b9165f288a6f2ce721361c50..7eaf6b01858bc049065e6bff0d94d551bf8c5a7d 100644 (file)
@@ -2167,7 +2167,7 @@ fi
 %files -n libcephfs-devel
 %dir %{_includedir}/cephfs
 %{_includedir}/cephfs/libcephfs.h
-%{_includedir}/cephfs/ceph_statx.h
+%{_includedir}/cephfs/ceph_ll_client.h
 %{_libdir}/libcephfs.so
 
 %files -n python%{python3_pkgversion}-cephfs
index e2cf6e9f375dfa92c8d8671f426276aebab0eb91..fbc1e4b95ffe6755087e89e4e9718619f676e6e9 100644 (file)
@@ -1,3 +1,3 @@
-usr/include/cephfs/ceph_statx.h
+usr/include/cephfs/ceph_ll_client.h
 usr/include/cephfs/libcephfs.h
 usr/lib/libcephfs.so
index 51a811c47966c7e3e5e2211303baa8d4d221642a..b92abcfa244e478e7d1f901a183d62c9bdae0556 100644 (file)
@@ -96,7 +96,7 @@
 #include "include/ceph_assert.h"
 #include "include/stat.h"
 
-#include "include/cephfs/ceph_statx.h"
+#include "include/cephfs/ceph_ll_client.h"
 
 #if HAVE_GETGROUPLIST
 #include <grp.h>
index 89f36328ffefcc99b79a90fbdc7ca7a28f4179fc..c488cf7c38634f79f0f311653cbba6bc6a0cede1 100644 (file)
@@ -23,7 +23,7 @@
 #include "common/cmdparse.h"
 #include "common/compiler_extensions.h"
 #include "include/common_fwd.h"
-#include "include/cephfs/ceph_statx.h"
+#include "include/cephfs/ceph_ll_client.h"
 #include "include/filepath.h"
 #include "include/interval_set.h"
 #include "include/lru.h"
index a6d05ff3ec998421c74b892cc58381f6962b293c..9ef5ccf19937bf8a5945417d2eb6e7aaf1076b40 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "common/errno.h"
 #include "include/ceph_assert.h"
-#include "include/cephfs/ceph_statx.h"
+#include "include/cephfs/ceph_ll_client.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_client
index 57d64a6666042837239b68a85d9a37e7601e95e7..b35606309ce3371e75ab1a508be7f8632914327c 100644 (file)
@@ -33,7 +33,7 @@
 #include "ioctl.h"
 #include "common/config.h"
 #include "include/ceph_assert.h"
-#include "include/cephfs/ceph_statx.h"
+#include "include/cephfs/ceph_ll_client.h"
 
 #include "fuse_ll.h"
 #include <fuse.h>
diff --git a/src/include/cephfs/ceph_ll_client.h b/src/include/cephfs/ceph_ll_client.h
new file mode 100644 (file)
index 0000000..f2645c0
--- /dev/null
@@ -0,0 +1,82 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * scalable distributed file system
+ *
+ * Copyright (C) Jeff Layton <jlayton@redhat.com>
+ *
+ * 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_CEPH_LL_CLIENT_H
+#define CEPH_CEPH_LL_CLIENT_H
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Heavily borrowed from David Howells' draft statx patchset.
+ *
+ * Since the xstat patches are still a work in progress, we borrow its data
+ * structures and #defines to implement ceph_getattrx. Once the xstat stuff
+ * has been merged we should drop this and switch over to using that instead.
+ */
+struct ceph_statx {
+       uint32_t        stx_mask;
+       uint32_t        stx_blksize;
+       uint32_t        stx_nlink;
+       uint32_t        stx_uid;
+       uint32_t        stx_gid;
+       uint16_t        stx_mode;
+       uint64_t        stx_ino;
+       uint64_t        stx_size;
+       uint64_t        stx_blocks;
+       dev_t           stx_dev;
+       dev_t           stx_rdev;
+       struct timespec stx_atime;
+       struct timespec stx_ctime;
+       struct timespec stx_mtime;
+       struct timespec stx_btime;
+       uint64_t        stx_version;
+};
+
+#define CEPH_STATX_MODE                0x00000001U     /* Want/got stx_mode */
+#define CEPH_STATX_NLINK       0x00000002U     /* Want/got stx_nlink */
+#define CEPH_STATX_UID         0x00000004U     /* Want/got stx_uid */
+#define CEPH_STATX_GID         0x00000008U     /* Want/got stx_gid */
+#define CEPH_STATX_RDEV                0x00000010U     /* Want/got stx_rdev */
+#define CEPH_STATX_ATIME       0x00000020U     /* Want/got stx_atime */
+#define CEPH_STATX_MTIME       0x00000040U     /* Want/got stx_mtime */
+#define CEPH_STATX_CTIME       0x00000080U     /* Want/got stx_ctime */
+#define CEPH_STATX_INO         0x00000100U     /* Want/got stx_ino */
+#define CEPH_STATX_SIZE                0x00000200U     /* Want/got stx_size */
+#define CEPH_STATX_BLOCKS      0x00000400U     /* Want/got stx_blocks */
+#define CEPH_STATX_BASIC_STATS 0x000007ffU     /* The stuff in the normal stat struct */
+#define CEPH_STATX_BTIME       0x00000800U     /* Want/got stx_btime */
+#define CEPH_STATX_VERSION     0x00001000U     /* Want/got stx_version */
+#define CEPH_STATX_ALL_STATS   0x00001fffU     /* All supported stats */
+
+/*
+ * Compatibility macros until these defines make their way into glibc
+ */
+#ifndef AT_NO_ATTR_SYNC
+#define AT_NO_ATTR_SYNC                0x4000 /* Don't sync attributes with the server */
+#endif
+
+/*
+ * The statx interfaces only allow these flags. In order to allow us to add
+ * others in the future, we disallow setting any that aren't recognized.
+ */
+#define CEPH_REQ_FLAG_MASK             (AT_SYMLINK_NOFOLLOW|AT_NO_ATTR_SYNC)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CEPH_STATX_H */
+
diff --git a/src/include/cephfs/ceph_statx.h b/src/include/cephfs/ceph_statx.h
deleted file mode 100644 (file)
index f27fa29..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-/*
- * scalable distributed file system
- *
- * Copyright (C) Jeff Layton <jlayton@redhat.com>
- *
- * Heavily borrowed from David Howells' draft statx patchset.
- *
- * 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_CEPH_STATX_H
-#define CEPH_CEPH_STATX_H
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Since the xstat patches are still a work in progress, we borrow its data
- * structures and #defines to implement ceph_getattrx. Once the xstat stuff
- * has been merged we should drop this and switch over to using that instead.
- */
-struct ceph_statx {
-       uint32_t        stx_mask;
-       uint32_t        stx_blksize;
-       uint32_t        stx_nlink;
-       uint32_t        stx_uid;
-       uint32_t        stx_gid;
-       uint16_t        stx_mode;
-       uint64_t        stx_ino;
-       uint64_t        stx_size;
-       uint64_t        stx_blocks;
-       dev_t           stx_dev;
-       dev_t           stx_rdev;
-       struct timespec stx_atime;
-       struct timespec stx_ctime;
-       struct timespec stx_mtime;
-       struct timespec stx_btime;
-       uint64_t        stx_version;
-};
-
-#define CEPH_STATX_MODE                0x00000001U     /* Want/got stx_mode */
-#define CEPH_STATX_NLINK       0x00000002U     /* Want/got stx_nlink */
-#define CEPH_STATX_UID         0x00000004U     /* Want/got stx_uid */
-#define CEPH_STATX_GID         0x00000008U     /* Want/got stx_gid */
-#define CEPH_STATX_RDEV                0x00000010U     /* Want/got stx_rdev */
-#define CEPH_STATX_ATIME       0x00000020U     /* Want/got stx_atime */
-#define CEPH_STATX_MTIME       0x00000040U     /* Want/got stx_mtime */
-#define CEPH_STATX_CTIME       0x00000080U     /* Want/got stx_ctime */
-#define CEPH_STATX_INO         0x00000100U     /* Want/got stx_ino */
-#define CEPH_STATX_SIZE                0x00000200U     /* Want/got stx_size */
-#define CEPH_STATX_BLOCKS      0x00000400U     /* Want/got stx_blocks */
-#define CEPH_STATX_BASIC_STATS 0x000007ffU     /* The stuff in the normal stat struct */
-#define CEPH_STATX_BTIME       0x00000800U     /* Want/got stx_btime */
-#define CEPH_STATX_VERSION     0x00001000U     /* Want/got stx_version */
-#define CEPH_STATX_ALL_STATS   0x00001fffU     /* All supported stats */
-
-/*
- * Compatibility macros until these defines make their way into glibc
- */
-#ifndef AT_NO_ATTR_SYNC
-#define AT_NO_ATTR_SYNC                0x4000 /* Don't sync attributes with the server */
-#endif
-
-/*
- * The statx interfaces only allow these flags. In order to allow us to add
- * others in the future, we disallow setting any that aren't recognized.
- */
-#define CEPH_REQ_FLAG_MASK             (AT_SYMLINK_NOFOLLOW|AT_NO_ATTR_SYNC)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CEPH_STATX_H */
-
index cfbe68a08b8558d1002e49bc8aa97196fd76a8c5..2876a317c303f7859b5c4009ff56b38977693178 100644 (file)
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <fcntl.h>
 
-#include "ceph_statx.h"
+#include "ceph_ll_client.h"
 
 #ifdef __cplusplus
 namespace ceph::common {
index 904ff177481da6b2f5cb6878e4c64475c1662d13..1dbc44c1dd11bf1b88bc06f350c6354d53f798c1 100644 (file)
@@ -106,7 +106,7 @@ cdef extern from "sys/time.h":
         long tv_sec
         long tv_usec
 
-cdef extern from "cephfs/ceph_statx.h":
+cdef extern from "cephfs/ceph_ll_client.h":
     cdef struct statx "ceph_statx":
         uint32_t    stx_mask
         uint32_t    stx_blksize