diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-07-13 22:18:36 +0200 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2018-08-02 21:26:12 +0200 |
| commit | 9bbeab41ce50542624ef381e7852d70f2f39a2b1 (patch) | |
| tree | 147627de0ce6b954c2848a93b54ef398a25a1ee0 /fs/ceph/dir.c | |
| parent | ceph: stop using current_kernel_time() (diff) | |
| download | linux-dev-9bbeab41ce50542624ef381e7852d70f2f39a2b1.tar.xz linux-dev-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/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 0210b02b86d4..82928cea0209 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -1397,7 +1397,7 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size, " rfiles: %20lld\n" " rsubdirs: %20lld\n" "rbytes: %20lld\n" - "rctime: %10ld.%09ld\n", + "rctime: %10lld.%09ld\n", ci->i_files + ci->i_subdirs, ci->i_files, ci->i_subdirs, @@ -1405,8 +1405,8 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size, ci->i_rfiles, ci->i_rsubdirs, ci->i_rbytes, - (long)ci->i_rctime.tv_sec, - (long)ci->i_rctime.tv_nsec); + ci->i_rctime.tv_sec, + ci->i_rctime.tv_nsec); } if (*ppos >= dfi->dir_info_len) |