diff options
| author | Petr Mladek <pmladek@suse.com> | 2025-12-01 14:14:34 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2025-12-01 14:14:34 +0100 |
| commit | 3869e431b51f3010f0d3bfc007c4a1b957c0ae1f (patch) | |
| tree | cae985276ee0de390f9d127147f29612385e90c4 /fs/ceph/dir.c | |
| parent | a9f349e3c0bebe7ae97750b32a72f452bdf707e2 (diff) | |
| parent | ace38521705bd79a47e5f46b6bae6dc044f3cfdc (diff) | |
Merge branch 'for-6.19-vsprintf-timespec64' into for-linus
Diffstat (limited to 'fs/ceph/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 32973c62c1a2..4730d38d270f 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -2156,7 +2156,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: %10lld.%09ld\n", + "rctime: %ptSp\n", ci->i_files + ci->i_subdirs, ci->i_files, ci->i_subdirs, @@ -2164,8 +2164,7 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size, ci->i_rfiles, ci->i_rsubdirs, ci->i_rbytes, - ci->i_rctime.tv_sec, - ci->i_rctime.tv_nsec); + &ci->i_rctime); } if (*ppos >= dfi->dir_info_len) |