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

hypertable: update libceph types

Browse Source 
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-04-28 15:52:01 -07:00
parent 101506aa6a
commit 347bc9f2b7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/hypertable/CephBroker.cc
View File

@ -54,7 +54,7 @@ static std::string cpp_strerror(int err)
return oss.str();
}
OpenFileDataCeph::OpenFileDataCeph(ceph_mount_t *cmount_, const String& fname,
OpenFileDataCeph::OpenFileDataCeph(struct ceph_mount_info *cmount_, const String& fname,
int _fd, int _flags)
: cmount(cmount_), fd(_fd), flags(_flags), filename(fname)
{
@ -382,7 +382,7 @@ void CephBroker::rmdir(ResponseCallback *cb, const char *dname) {
}
int CephBroker::rmdir_recursive(const char *directory) {
ceph_dir_result_t *dirp;
struct ceph_dir_result *dirp;
struct dirent de;
struct stat st;
int r;
@ -450,7 +450,7 @@ void CephBroker::readdir(ResponseCallbackReaddir *cb, const char *dname) {
//get from ceph in a buffer
make_abs_path(dname, absdir);
ceph_dir_result_t *dirp;
struct ceph_dir_result *dirp;
ceph_opendir(cmount, absdir.c_str(), &dirp);
int r;
int buflen = 100; //good default?

7
src/client/hypertable/CephBroker.h
View File

@ -34,7 +34,6 @@ extern "C" {
#include "DfsBroker/Lib/Broker.h"
class ceph_mount_t;
namespace Hypertable {
using namespace DfsBroker;
@ -43,10 +42,10 @@ namespace Hypertable {
*/
class OpenFileDataCeph : public OpenFileData {
public:
OpenFileDataCeph(ceph_mount_t *cmount_, const String& fname,
OpenFileDataCeph(struct ceph_mount_info *cmount_, const String& fname,
int _fd, int _flags);
virtual ~OpenFileDataCeph();
ceph_mount_t *cmount;
struct ceph_mount_info *cmount;
int fd;
int flags;
String filename;
@ -96,7 +95,7 @@ namespace Hypertable {
StaticBuffer &serialized_parameters);
private:
ceph_mount_t *cmount;
struct ceph_mount_info *cmount;
static atomic_t ms_next_fd;
virtual void report_error(ResponseCallback *cb, int error);