|
@@ -991,7 +991,7 @@ static int send_cap_msg(struct ceph_mds_session *session,
|
|
|
u32 seq, u64 flush_tid, u64 oldest_flush_tid,
|
|
u32 seq, u64 flush_tid, u64 oldest_flush_tid,
|
|
|
u32 issue_seq, u32 mseq, u64 size, u64 max_size,
|
|
u32 issue_seq, u32 mseq, u64 size, u64 max_size,
|
|
|
struct timespec *mtime, struct timespec *atime,
|
|
struct timespec *mtime, struct timespec *atime,
|
|
|
- u64 time_warp_seq,
|
|
|
|
|
|
|
+ struct timespec *ctime, u64 time_warp_seq,
|
|
|
kuid_t uid, kgid_t gid, umode_t mode,
|
|
kuid_t uid, kgid_t gid, umode_t mode,
|
|
|
u64 xattr_version,
|
|
u64 xattr_version,
|
|
|
struct ceph_buffer *xattrs_buf,
|
|
struct ceph_buffer *xattrs_buf,
|
|
@@ -1042,6 +1042,8 @@ static int send_cap_msg(struct ceph_mds_session *session,
|
|
|
ceph_encode_timespec(&fc->mtime, mtime);
|
|
ceph_encode_timespec(&fc->mtime, mtime);
|
|
|
if (atime)
|
|
if (atime)
|
|
|
ceph_encode_timespec(&fc->atime, atime);
|
|
ceph_encode_timespec(&fc->atime, atime);
|
|
|
|
|
+ if (ctime)
|
|
|
|
|
+ ceph_encode_timespec(&fc->ctime, ctime);
|
|
|
fc->time_warp_seq = cpu_to_le32(time_warp_seq);
|
|
fc->time_warp_seq = cpu_to_le32(time_warp_seq);
|
|
|
|
|
|
|
|
fc->uid = cpu_to_le32(from_kuid(&init_user_ns, uid));
|
|
fc->uid = cpu_to_le32(from_kuid(&init_user_ns, uid));
|
|
@@ -1116,7 +1118,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
|
|
|
int held, revoking, dropping, keep;
|
|
int held, revoking, dropping, keep;
|
|
|
u64 seq, issue_seq, mseq, time_warp_seq, follows;
|
|
u64 seq, issue_seq, mseq, time_warp_seq, follows;
|
|
|
u64 size, max_size;
|
|
u64 size, max_size;
|
|
|
- struct timespec mtime, atime;
|
|
|
|
|
|
|
+ struct timespec mtime, atime, ctime;
|
|
|
int wake = 0;
|
|
int wake = 0;
|
|
|
umode_t mode;
|
|
umode_t mode;
|
|
|
kuid_t uid;
|
|
kuid_t uid;
|
|
@@ -1180,6 +1182,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
|
|
|
ci->i_requested_max_size = max_size;
|
|
ci->i_requested_max_size = max_size;
|
|
|
mtime = inode->i_mtime;
|
|
mtime = inode->i_mtime;
|
|
|
atime = inode->i_atime;
|
|
atime = inode->i_atime;
|
|
|
|
|
+ ctime = inode->i_ctime;
|
|
|
time_warp_seq = ci->i_time_warp_seq;
|
|
time_warp_seq = ci->i_time_warp_seq;
|
|
|
uid = inode->i_uid;
|
|
uid = inode->i_uid;
|
|
|
gid = inode->i_gid;
|
|
gid = inode->i_gid;
|
|
@@ -1198,7 +1201,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
|
|
|
ret = send_cap_msg(session, ceph_vino(inode).ino, cap_id,
|
|
ret = send_cap_msg(session, ceph_vino(inode).ino, cap_id,
|
|
|
op, keep, want, flushing, seq,
|
|
op, keep, want, flushing, seq,
|
|
|
flush_tid, oldest_flush_tid, issue_seq, mseq,
|
|
flush_tid, oldest_flush_tid, issue_seq, mseq,
|
|
|
- size, max_size, &mtime, &atime, time_warp_seq,
|
|
|
|
|
|
|
+ size, max_size, &mtime, &atime, &ctime, time_warp_seq,
|
|
|
uid, gid, mode, xattr_version, xattr_blob,
|
|
uid, gid, mode, xattr_version, xattr_blob,
|
|
|
follows, inline_data);
|
|
follows, inline_data);
|
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|
|
@@ -1320,7 +1323,7 @@ retry:
|
|
|
capsnap->dirty, 0, capsnap->flush_tid, 0,
|
|
capsnap->dirty, 0, capsnap->flush_tid, 0,
|
|
|
0, mseq, capsnap->size, 0,
|
|
0, mseq, capsnap->size, 0,
|
|
|
&capsnap->mtime, &capsnap->atime,
|
|
&capsnap->mtime, &capsnap->atime,
|
|
|
- capsnap->time_warp_seq,
|
|
|
|
|
|
|
+ &capsnap->ctime, capsnap->time_warp_seq,
|
|
|
capsnap->uid, capsnap->gid, capsnap->mode,
|
|
capsnap->uid, capsnap->gid, capsnap->mode,
|
|
|
capsnap->xattr_version, capsnap->xattr_blob,
|
|
capsnap->xattr_version, capsnap->xattr_blob,
|
|
|
capsnap->follows, capsnap->inline_data);
|
|
capsnap->follows, capsnap->inline_data);
|
Yan, Zheng