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

filestore: clean up btrfs, clone range detection

Browse Source 
Use statfs to detect btrfs, not the trans ioctl (which won't work
if you're not root!).  Use separate bool for clone range support.
This commit is contained in:
Sage Weil 2010-03-08 11:00:50 -08:00
parent ca02d68cc6
commit 822ae4a1bb
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/os/FileStore.cc
View File

@ -417,25 +417,24 @@ int FileStore::_detect_fs()
int fd = ::open(basedir.c_str(), O_RDONLY);
if (fd < 0)
return -errno;
int r = ::ioctl(fd, BTRFS_IOC_TRANS_START);
if (r == 0) {
dout(0) << "mount btrfs TRANS_START ioctl is supported" << dendl;
::ioctl(fd, BTRFS_IOC_TRANS_END);
struct statfs st;
int r = ::fstatfs(fd, &st);
if (r == 0 && st.f_type == 0x9123683E) {
dout(0) << "mount detected btrfs" << dendl;
btrfs = true;
// clone_range?
btrfs = 2;
int r = _do_clone_range(fsid_fd, -1, 0, 1);
if (r == -EBADF) {
dout(0) << "mount btrfs CLONE_RANGE ioctl is supported" << dendl;
btrfs_clone_range = true;
} else {
dout(0) << "mount btrfs CLONE_RANGE ioctl is NOT supported: " << strerror_r(-r, buf, sizeof(buf)) << dendl;
btrfs = 1;
}
dout(0) << "mount detected btrfs" << dendl;
} else {
dout(0) << "mount btrfs TRANS_START ioctl is NOT supported: " << strerror_r(-r, buf, sizeof(buf)) << dendl;
dout(0) << "mount did NOT detect btrfs" << dendl;
btrfs = 0;
btrfs = false;
}
::close(fd);
return 0;
@ -1405,7 +1404,7 @@ int FileStore::_do_clone_range(int from, int to, __u64 off, __u64 len)
dout(20) << "_do_clone_range " << off << "~" << len << dendl;
int r = 0;
if (btrfs >= 2) {
if (btrfs_clone_range) {
btrfs_ioctl_clone_range_args a;
a.src_fd = from;
a.src_offset = off;

5
src/os/FileStore.h
View File

@ -43,8 +43,9 @@ class FileStore : public JournalingObjectStore {
char current_op_seq_fn[PATH_MAX];
__u64 fsid;
int btrfs;
bool btrfs;
bool btrfs_trans_start_end;
bool btrfs_clone_range;
int fsid_fd, op_fd;
int basedir_fd, current_fd;
@ -170,7 +171,7 @@ class FileStore : public JournalingObjectStore {
public:
FileStore(const char *base, const char *jdev = 0) :
basedir(base), journalpath(jdev ? jdev:""),
btrfs(false), btrfs_trans_start_end(false),
btrfs(false), btrfs_trans_start_end(false), btrfs_clone_range(false),
fsid_fd(-1), op_fd(-1),
attrs(this), fake_attrs(false),
collections(this), fake_collections(false),