diff options
| author |   Petr Mladek <pmladek@suse.com> | 2021-06-29 09:51:45 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-06-29 09:51:45 +0200 |
| commit | 80ae552917228b97ca9f7df83f74ac306d6fd68f (patch) | |
| tree | 858aac1d82608e0caaaa994a8bf1b19dd5282f06 /fs | |
| parent | printk: Remove trailing semicolon in macros (diff) | |
| parent | usb: host: xhci-tegra: Switch to use %ptTs (diff) | |
| download | wireguard-linux-80ae552917228b97ca9f7df83f74ac306d6fd68f.tar.xz wireguard-linux-80ae552917228b97ca9f7df83f74ac306d6fd68f.zip | |
Merge branch 'for-5.14-vsprintf-pts' into for-linus
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nilfs2/sysfs.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c index 303d71430bdd..4e10423f0448 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -19,19 +19,6 @@ /* /sys/fs/<nilfs>/ */ static struct kset *nilfs_kset; -#define NILFS_SHOW_TIME(time_t_val, buf) ({ \ - struct tm res; \ - int count = 0; \ - time64_to_tm(time_t_val, 0, &res); \ - res.tm_year += 1900; \ - res.tm_mon += 1; \ - count = scnprintf(buf, PAGE_SIZE, \ - "%ld-%.2d-%.2d %.2d:%.2d:%.2d\n", \ - res.tm_year, res.tm_mon, res.tm_mday, \ - res.tm_hour, res.tm_min, res.tm_sec);\ - count; \ -}) - #define NILFS_DEV_INT_GROUP_OPS(name, parent_name) \ static ssize_t nilfs_##name##_attr_show(struct kobject *kobj, \ struct attribute *attr, char *buf) \ @@ -576,7 +563,7 @@ nilfs_segctor_last_seg_write_time_show(struct nilfs_segctor_attr *attr, ctime = nilfs->ns_ctime; up_read(&nilfs->ns_segctor_sem); - return NILFS_SHOW_TIME(ctime, buf); + return sysfs_emit(buf, "%ptTs\n", &ctime); } static ssize_t @@ -604,7 +591,7 @@ nilfs_segctor_last_nongc_write_time_show(struct nilfs_segctor_attr *attr, nongc_ctime = nilfs->ns_nongc_ctime; up_read(&nilfs->ns_segctor_sem); - return NILFS_SHOW_TIME(nongc_ctime, buf); + return sysfs_emit(buf, "%ptTs\n", &nongc_ctime); } static ssize_t @@ -724,7 +711,7 @@ nilfs_superblock_sb_write_time_show(struct nilfs_superblock_attr *attr, sbwtime = nilfs->ns_sbwtime; up_read(&nilfs->ns_sem); - return NILFS_SHOW_TIME(sbwtime, buf); + return sysfs_emit(buf, "%ptTs\n", &sbwtime); } static ssize_t |