Merge pull request #21055 from tchaikov/wip-pr-20994

filestore,rgw: fix types/casts making clang on 32-Bit working

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/os/filestore/FileStore.cc
Simple merge

diff --cc src/os/filestore/FileStore.h
index 9688783ba58b18784cc08a337eb483d9c335a30e,ea1865eeb41bc0e3f3f8168da750e2d6c0d6eb66..37f3a8284edc8f863c89f77c213d8bcd56f66a22
--- 1/src/os/filestore/FileStore.h
--- 2/src/os/filestore/FileStore.h
+++ b/src/os/filestore/FileStore.h
@@@ -158,11 -158,8 +158,11 @@@ private
  
    FileStoreBackend *backend;
  
-   void create_backend(long f_type);
+   void create_backend(unsigned long f_type);
  
 +  int vdo_fd = -1;
 +  string vdo_name;
 +
    deque<uint64_t> snaps;
  
    // Indexed Collections

diff --cc src/rgw/rgw_rados.cc
Simple merge