diff options
| author | Arnd Bergmann | 2018-07-13 22:18:36 +0200 |
|---|---|---|
| committer | Ilya Dryomov | 2018-08-02 21:26:12 +0200 |
| commit | 9bbeab41ce50542624ef381e7852d70f2f39a2b1 (patch) | |
| tree | 147627de0ce6b954c2848a93b54ef398a25a1ee0 /fs/ceph/mds_client.c | |
| parent | ceph: stop using current_kernel_time() (diff) | |
| download | kernel-qcow2-linux-9bbeab41ce50542624ef381e7852d70f2f39a2b1.tar.gz kernel-qcow2-linux-9bbeab41ce50542624ef381e7852d70f2f39a2b1.tar.xz kernel-qcow2-linux-9bbeab41ce50542624ef381e7852d70f2f39a2b1.zip | |
ceph: use timespec64 for inode timestamp
Since the vfs structures are all using timespec64, we can now
change the internal representation, using ceph_encode_timespec64 and
ceph_decode_timespec64.
In case of ceph_aux_inode however, we need to avoid doing a memcmp()
on uninitialized padding data, so the members of the i_mtime field get
copied individually into 64-bit integers.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph/mds_client.c')
| -rw-r--r-- | fs/ceph/mds_client.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index d2679dce7332..a1a510438b7c 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2961,15 +2961,12 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap, rec.v2.flock_len = (__force __le32) ((ci->i_ceph_flags & CEPH_I_ERROR_FILELOCK) ? 0 : 1); } else { - struct timespec ts; rec.v1.cap_id = cpu_to_le64(cap->cap_id); rec.v1.wanted = cpu_to_le32(__ceph_caps_wanted(ci)); rec.v1.issued = cpu_to_le32(cap->issued); rec.v1.size = cpu_to_le64(inode->i_size); - ts = timespec64_to_timespec(inode->i_mtime); - ceph_encode_timespec(&rec.v1.mtime, &ts); - ts = timespec64_to_timespec(inode->i_atime); - ceph_encode_timespec(&rec.v1.atime, &ts); + ceph_encode_timespec64(&rec.v1.mtime, &inode->i_mtime); + ceph_encode_timespec64(&rec.v1.atime, &inode->i_atime); rec.v1.snaprealm = cpu_to_le64(ci->i_snap_realm->ino); rec.v1.pathbase = cpu_to_le64(pathbase); } |