alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-09 00:00:04 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Added ktime_get_real_seconds() wrapper

Browse Source 
Also, changed the last_mount print so it no longer prints out two newlines.
This commit is contained in:
Tim Schlueter 2018-11-04 21:00:33 -08:00
parent db8cffeaed
commit 03c79a9a25
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/sched.h
View File

@ -138,6 +138,15 @@ static inline u64 ktime_get_seconds(void)
return ts.tv_sec; return ts.tv_sec;
} }
static inline u64 ktime_get_real_seconds(void)
{
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
return ts.tv_sec;
}
static inline struct timespec current_kernel_time(void) static inline struct timespec current_kernel_time(void)
{ {
struct timespec ts; struct timespec ts;

12
libbcachefs.c
View File

@ -403,6 +403,7 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f,
char data_allowed_str[100]; char data_allowed_str[100];
char data_has_str[100]; char data_has_str[100];
char group[64]; char group[64];
char time_str[64];
if (!bch2_member_exists(m)) if (!bch2_member_exists(m))
continue; continue;
@ -435,6 +436,15 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f,
if (!data_has_str[0]) if (!data_has_str[0])
strcpy(data_has_str, "(none)"); strcpy(data_has_str, "(none)");
if (last_mount) {
struct tm *tm = localtime(&last_mount);
size_t err = strftime(time_str, sizeof(time_str), "%c", tm);
if (!err)
strcpy(time_str, "(formatting error)");
} else {
strcpy(time_str, "(never)");
}
printf(" Device %u:\n" printf(" Device %u:\n"
" UUID: %s\n" " UUID: %s\n"
" Size: %s\n" " Size: %s\n"
@ -456,7 +466,7 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f,
pr_units(le16_to_cpu(m->bucket_size), units), pr_units(le16_to_cpu(m->bucket_size), units),
le16_to_cpu(m->first_bucket), le16_to_cpu(m->first_bucket),
le64_to_cpu(m->nbuckets), le64_to_cpu(m->nbuckets),
last_mount ? ctime(&last_mount) : "(never)", time_str,
BCH_MEMBER_STATE(m) < BCH_MEMBER_STATE_NR BCH_MEMBER_STATE(m) < BCH_MEMBER_STATE_NR
? bch2_dev_state[BCH_MEMBER_STATE(m)] ? bch2_dev_state[BCH_MEMBER_STATE(m)]