diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2016-01-13 22:08:34 -0900 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2016-10-07 12:35:30 -0800 |
| commit | 2c3a1aacaaacd38980404dbc1e01fa53693cf9c6 (patch) | |
| tree | be3ca8cb862b164c772b55526063a7b32d9a085a | |
| parent | 680952bd8aad281497a5a339271d69f3575fbc0c (diff) | |
bcache: last mount := 64 bits
| -rw-r--r-- | drivers/md/bcache/super.c | 8 | ||||
| -rw-r--r-- | include/uapi/linux/bcache.h | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 166b36d74b4a..faddbd4ac749 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1218,7 +1218,7 @@ static const char *run_cache_set(struct cache_set *c) const char *err = "cannot allocate memory"; struct cache *ca; unsigned i, id; - long now; + time64_t now; lockdep_assert_held(&bch_register_lock); BUG_ON(test_bit(CACHE_SET_RUNNING, &c->flags)); @@ -1389,10 +1389,10 @@ static const char *run_cache_set(struct cache_set *c) goto err; } - now = get_seconds(); + now = ktime_get_seconds(); rcu_read_lock(); for_each_cache_rcu(ca, c, i) - c->disk_mi[ca->sb.nr_this_dev].last_mount = cpu_to_le32(now); + c->disk_mi[ca->sb.nr_this_dev].last_mount = cpu_to_le64(now); rcu_read_unlock(); bcache_write_super(c); @@ -2057,7 +2057,7 @@ int bch_cache_set_add_cache(struct cache_set *c, const char *path) * before we start bashing the disk stuff. */ mi = sb.sb->members[sb.sb->nr_this_dev]; - mi.last_mount = cpu_to_le32(get_seconds()); + mi.last_mount = cpu_to_le64(ktime_get_seconds()); down_read(&c->gc_lock); diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 8a9ff6695a1d..8177149dae07 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -633,7 +633,8 @@ struct cache_member { __le64 nbuckets; /* device size */ __le16 first_bucket; /* index of first bucket used */ __le16 bucket_size; /* sectors */ - __le32 last_mount; /* time_t */ + __le32 pad; + __le64 last_mount; /* time_t */ __le64 f1; __le64 f2; |