RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16171 from wjwithagen/wip-wjw-freebsd-nobtrfs

Browse Source 
os/filestore: Exclude BTRFS on FreeBSD

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-07-06 14:07:34 -05:00 committed by GitHub
commit 2e7353a07b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/filestore/FileStore.cc
View File

@ -904,11 +904,14 @@ int FileStore::mkfs()
goto close_fsid_fd;
}
#if defined(__linux__)
if (basefs.f_type == BTRFS_SUPER_MAGIC &&
!g_ceph_context->check_experimental_feature_enabled("btrfs")) {
derr <<__FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
goto close_fsid_fd;
}
#endif
create_backend(basefs.f_type);
ret = backend->create_current();
@ -1163,11 +1166,14 @@ int FileStore::_detect_fs()
blk_size = st.f_bsize;
#if defined(__linux__)
if (st.f_type == BTRFS_SUPER_MAGIC &&
!g_ceph_context->check_experimental_feature_enabled("btrfs")) {
derr <<__FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
return -EPERM;
}
#endif
create_backend(st.f_type);
r = backend->detect_features();