diff options
| author | Daniel Glaser <the78mole@chaintronics.com> | 2018-03-21 20:42:59 +0100 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2018-03-27 09:39:21 +0200 |
| commit | 3f3ea2aae6a171dcb3c61d7aa828624c8a53bc77 (patch) | |
| tree | 987a6020d84a707648c399f7b45c2f446d04f88f /src/rgw/rgw_sync_log_trim.cc | |
| parent | Merge pull request #21032 from simransinghal/fixtypo (diff) | |
| download | ceph-3f3ea2aae6a171dcb3c61d7aa828624c8a53bc77.tar.xz ceph-3f3ea2aae6a171dcb3c61d7aa828624c8a53bc77.zip | |
filestore,rgw: Fix types/casts making clang on 32-Bit working
Fixing types for FS_SUPER_MAGIC from long to unsigned long in
Filestore.cc and adding some static_casts to rgw_rados and rgw_sync_log_trim due to clang
errors.
Signed-off-by: Daniel Glaser <the78mole@chaintronics.com>
Diffstat (limited to 'src/rgw/rgw_sync_log_trim.cc')
| -rw-r--r-- | src/rgw/rgw_sync_log_trim.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rgw/rgw_sync_log_trim.cc b/src/rgw/rgw_sync_log_trim.cc index 42b348312fb..e1002253b8d 100644 --- a/src/rgw/rgw_sync_log_trim.cc +++ b/src/rgw/rgw_sync_log_trim.cc @@ -897,7 +897,7 @@ int BucketTrimPollCR::operate() reenter(this) { for (;;) { set_status("sleeping"); - wait(utime_t{config.trim_interval_sec, 0}); + wait(utime_t{static_cast<time_t>(config.trim_interval_sec), 0}); // prevent others from trimming for our entire wait interval set_status("acquiring trim lock"); |