{
unsigned mask = 0;
- /* if NO_ATTR_SYNC is set, then we don't need any -- just use what's in cache */
- if (flags & AT_NO_ATTR_SYNC)
+ /* if AT_STATX_DONT_SYNC is set, then we don't need any -- just use what's in cache */
+ if (flags & AT_STATX_DONT_SYNC)
goto out;
- /* Always set PIN to distinguish from AT_NO_ATTR_SYNC case */
+ /* Always set PIN to distinguish from AT_STATX_DONT_SYNC case */
mask |= CEPH_CAP_PIN;
if (want & (CEPH_STATX_MODE|CEPH_STATX_UID|CEPH_STATX_GID|CEPH_STATX_BTIME|CEPH_STATX_CTIME|CEPH_STATX_VERSION))
mask |= CEPH_CAP_AUTH_SHARED;
memset(stx, 0, sizeof(struct ceph_statx));
/*
- * If mask is 0, then the caller set AT_NO_ATTR_SYNC. Reset the mask
+ * If mask is 0, then the caller set AT_STATX_DONT_SYNC. Reset the mask
* so that all bits are set.
*/
if (!mask)
* If @a cb returns a negative error code, stop and return that.
*/
int readdir_r_cb(dir_result_t *dirp, add_dirent_cb_t cb, void *p,
- unsigned want=0, unsigned flags=AT_NO_ATTR_SYNC,
+ unsigned want=0, unsigned flags=AT_STATX_DONT_SYNC,
bool getref=false);
struct dirent * readdir(dir_result_t *d);
int r;
if ((r = ceph_opendir(cmount, directory, &dirp)) < 0)
return r; //failed to open
- while ((r = ceph_readdirplus_r(cmount, dirp, &de, &stx, CEPH_STATX_INO, AT_NO_ATTR_SYNC, NULL)) > 0) {
+ while ((r = ceph_readdirplus_r(cmount, dirp, &de, &stx, CEPH_STATX_INO, AT_STATX_DONT_SYNC, NULL)) > 0) {
String new_dir = de.d_name;
if(!(new_dir.compare(".")==0 || new_dir.compare("..")==0)) {
new_dir = directory;
/*
* 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 */
+#ifndef AT_STATX_DONT_SYNC
+#define AT_STATX_SYNC_TYPE 0x6000
+#define AT_STATX_SYNC_AS_STAT 0x0000
+#define AT_STATX_FORCE_SYNC 0x2000
+#define AT_STATX_DONT_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)
+#define CEPH_REQ_FLAG_MASK (AT_SYMLINK_NOFOLLOW|AT_STATX_DONT_SYNC)
/* delegation recalls */
typedef void (*ceph_deleg_cb_t)(Fh *fh, void *priv);
* @param fd the file descriptor of the file to get statistics of.
* @param stx the ceph_statx struct that will be filled in with the file's statistics.
* @param want bitfield of CEPH_STATX_* flags showing designed attributes
- * @param flags bitfield that can be used to set AT_* modifier flags (only AT_NO_ATTR_SYNC and AT_SYMLINK_NOFOLLOW)
+ * @param flags bitfield that can be used to set AT_* modifier flags (AT_STATX_SYNC_AS_STAT, AT_STATX_FORCE_SYNC, AT_STATX_DONT_SYNC and AT_SYMLINK_NOFOLLOW)
* @returns 0 on success or negative error code on failure.
*/
int ceph_fstatx(struct ceph_mount_info *cmount, int fd, struct ceph_statx *stx,
* @param relpath to the file/directory to get statistics of
* @param stx the ceph_statx struct that will be filled in with the file's statistics.
* @param want bitfield of CEPH_STATX_* flags showing designed attributes
- * @param flags bitfield that can be used to set AT_* modifier flags (only AT_NO_ATTR_SYNC and AT_SYMLINK_NOFOLLOW)
+ * @param flags bitfield that can be used to set AT_* modifier flags (AT_STATX_SYNC_AS_STAT, AT_STATX_FORCE_SYNC, AT_STATX_DONT_SYNC and AT_SYMLINK_NOFOLLOW)
* @returns 0 on success or negative error code on failure.
*/
int ceph_statxat(struct ceph_mount_info *cmount, int dirfd, const char *relpath,
* @param path the file or directory to get the statistics of.
* @param stx the ceph_statx struct that will be filled in with the file's statistics.
* @param want bitfield of CEPH_STATX_* flags showing designed attributes
- * @param flags bitfield that can be used to set AT_* modifier flags (only AT_NO_ATTR_SYNC and AT_SYMLINK_NOFOLLOW)
+ * @param flags bitfield that can be used to set AT_* modifier flags (AT_STATX_SYNC_AS_STAT, AT_STATX_FORCE_SYNC, AT_STATX_DONT_SYNC and AT_SYMLINK_NOFOLLOW)
* @returns 0 on success or negative error code on failure.
*/
int ceph_statx(struct ceph_mount_info *cmount, const char *path, struct ceph_statx *stx,
import os
import time
-AT_NO_ATTR_SYNC = 0x4000
-AT_SYMLINK_NOFOLLOW = 0x100
+AT_SYMLINK_NOFOLLOW = 0x0100
+AT_STATX_SYNC_TYPE = 0x6000
+AT_STATX_SYNC_AS_STAT = 0x0000
+AT_STATX_FORCE_SYNC = 0x2000
+AT_STATX_DONT_SYNC = 0x4000
cdef int AT_SYMLINK_NOFOLLOW_CDEF = AT_SYMLINK_NOFOLLOW
CEPH_STATX_BASIC_STATS = 0x7ff
cdef int CEPH_STATX_BASIC_STATS_CDEF = CEPH_STATX_BASIC_STATS
:param path: the file or directory to get the statistics of.
:param mask: want bitfield of CEPH_STATX_* flags showing designed attributes.
- :param flag: bitfield that can be used to set AT_* modifier flags (only AT_NO_ATTR_SYNC and AT_SYMLINK_NOFOLLOW)
+ :param flag: bitfield that can be used to set AT_* modifier flags (AT_STATX_SYNC_AS_STAT, AT_STATX_FORCE_SYNC, AT_STATX_DONT_SYNC and AT_SYMLINK_NOFOLLOW)
"""
self.require_state("mounted")
struct dirent rdent;
struct ceph_statx stx;
int len = ceph_readdirplus_r(cmount, ls_dir, &rdent, &stx,
- CEPH_STATX_SIZE, AT_NO_ATTR_SYNC, NULL);
+ CEPH_STATX_SIZE, AT_STATX_DONT_SYNC, NULL);
if (len == 0)
break;
ASSERT_EQ(len, 1);
/*
* Now sleep, do a chmod on the first client and the see whether we get a
- * different ctime with a statx that uses AT_NO_ATTR_SYNC
+ * different ctime with a statx that uses AT_STATX_DONT_SYNC
*/
sleep(1);
stx.stx_mode = 0644;
ASSERT_EQ(ceph_ll_setattr(cmount1, file1, &stx, CEPH_SETATTR_MODE, perms1), 0);
- ASSERT_EQ(ceph_ll_getattr(cmount2, file2, &stx, CEPH_STATX_CTIME, AT_NO_ATTR_SYNC, perms2), 0);
+ ASSERT_EQ(ceph_ll_getattr(cmount2, file2, &stx, CEPH_STATX_CTIME, AT_STATX_DONT_SYNC, perms2), 0);
ASSERT_TRUE(stx.stx_mask & CEPH_STATX_CTIME);
ASSERT_TRUE(stx.stx_ctime.tv_sec == old_ctime.tv_sec &&
stx.stx_ctime.tv_nsec == old_ctime.tv_nsec);
int r = ceph_statxat(m_remote_mount, fh.r_fd_dir_root, epath.c_str(), &tstx,
CEPH_STATX_MODE | CEPH_STATX_UID | CEPH_STATX_GID |
CEPH_STATX_SIZE | CEPH_STATX_ATIME | CEPH_STATX_MTIME,
- AT_NO_ATTR_SYNC | AT_SYMLINK_NOFOLLOW);
+ AT_STATX_DONT_SYNC | AT_SYMLINK_NOFOLLOW);
if (r < 0) {
derr << ": failed to stat remote directory=" << epath << ": "
<< cpp_strerror(r) << dendl;
struct dirent de;
while (true) {
r = ceph_readdirplus_r(m_remote_mount, entry.dirp, &de, &stx,
- CEPH_STATX_MODE, AT_NO_ATTR_SYNC | AT_SYMLINK_NOFOLLOW, NULL);
+ CEPH_STATX_MODE, AT_STATX_DONT_SYNC | AT_SYMLINK_NOFOLLOW, NULL);
if (r < 0) {
derr << ": failed to read remote directory=" << entry.epath << dendl;
break;
int r = ceph_statxat(fh.p_mnt, fh.p_fd, epath.c_str(), &pstx,
CEPH_STATX_MODE | CEPH_STATX_UID | CEPH_STATX_GID |
CEPH_STATX_SIZE | CEPH_STATX_CTIME | CEPH_STATX_MTIME,
- AT_NO_ATTR_SYNC | AT_SYMLINK_NOFOLLOW);
+ AT_STATX_DONT_SYNC | AT_SYMLINK_NOFOLLOW);
if (r < 0 && r != -ENOENT && r != -ENOTDIR) {
derr << ": failed to stat prev entry= " << epath << ": " << cpp_strerror(r)
<< dendl;
struct ceph_statx pstx;
auto dpath = entry_path(epath, d_name);
r = ceph_statxat(fh.p_mnt, fh.p_fd, dpath.c_str(), &pstx,
- CEPH_STATX_MODE, AT_NO_ATTR_SYNC | AT_SYMLINK_NOFOLLOW);
+ CEPH_STATX_MODE, AT_STATX_DONT_SYNC | AT_SYMLINK_NOFOLLOW);
if (r < 0) {
derr << ": failed to stat (prev) directory=" << dpath << ": "
<< cpp_strerror(r) << dendl;
struct ceph_statx cstx;
r = ceph_statxat(m_local_mount, fh.c_fd, dpath.c_str(), &cstx,
- CEPH_STATX_MODE, AT_NO_ATTR_SYNC | AT_SYMLINK_NOFOLLOW);
+ CEPH_STATX_MODE, AT_STATX_DONT_SYNC | AT_SYMLINK_NOFOLLOW);
if (r < 0 && r != -ENOENT) {
derr << ": failed to stat local (cur) directory=" << dpath << ": "
<< cpp_strerror(r) << dendl;
r = ceph_fstatx(m_local_mount, fh.c_fd, &tstx,
CEPH_STATX_MODE | CEPH_STATX_UID | CEPH_STATX_GID |
CEPH_STATX_SIZE | CEPH_STATX_ATIME | CEPH_STATX_MTIME,
- AT_NO_ATTR_SYNC | AT_SYMLINK_NOFOLLOW);
+ AT_STATX_DONT_SYNC | AT_SYMLINK_NOFOLLOW);
if (r < 0) {
derr << ": failed to stat snap=" << current.first << ": " << cpp_strerror(r)
<< dendl;
r = ceph_readdirplus_r(m_local_mount, entry.dirp, &de, &stx,
CEPH_STATX_MODE | CEPH_STATX_UID | CEPH_STATX_GID |
CEPH_STATX_SIZE | CEPH_STATX_ATIME | CEPH_STATX_MTIME,
- AT_NO_ATTR_SYNC | AT_SYMLINK_NOFOLLOW, NULL);
+ AT_STATX_DONT_SYNC | AT_SYMLINK_NOFOLLOW, NULL);
if (r < 0) {
derr << ": failed to local read directory=" << entry.epath << dendl;
break;
projects / ceph.git / commitdiff