From: Kefu Chai <tchaikov@gmail.com>
Date: Sat, 7 Apr 2018 09:21:06 +0000 (+0800)
Subject: Merge pull request #21055 from tchaikov/wip-pr-20994
X-Git-Tag: v13.1.0~383
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e8d490f7dee6307d06747aafe11a8b1859b80d8;p=ceph.git

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>
---

7e8d490f7dee6307d06747aafe11a8b1859b80d8
diff --cc src/os/filestore/FileStore.h
index 9688783ba58,ea1865eeb41..37f3a8284ed
--- a/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