diff options
| author | Sage Weil <sage@newdream.net> | 2012-01-28 11:40:08 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-01-28 11:40:08 -0800 |
| commit | 9e78d53d6a8da9d2fffd0262f74c0d3b99939793 (patch) | |
| tree | f9a82ac8f8b55238b3e666b9092ba9e65c264ddc | |
| parent | f9620d7d6db27af4041169cfc1bbd18b08c819ab (diff) | |
| download | ceph-9e78d53d6a8da9d2fffd0262f74c0d3b99939793.tar.gz | |
clock: ignore clock_offset if cct is NULL
This is helpful e.g. from assert.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | src/common/Clock.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/Clock.cc b/src/common/Clock.cc index 7707fb3d2d3..9b6554a8e9d 100644 --- a/src/common/Clock.cc +++ b/src/common/Clock.cc @@ -25,13 +25,15 @@ utime_t ceph_clock_now(CephContext *cct) struct timeval tv; gettimeofday(&tv, NULL); utime_t n(&tv); - n += cct->_conf->clock_offset; + if (cct) + n += cct->_conf->clock_offset; return n; } time_t ceph_clock_gettime(CephContext *cct) { time_t ret = time(NULL); - ret += ((time_t)cct->_conf->clock_offset); + if (cct) + ret += ((time_t)cct->_conf->clock_offset); return ret; } |