From d5f114aaa073358ae5f4ff60bf67d83e93d05f8d Mon Sep 17 00:00:00 2001 From: sageweil Date: Tue, 27 Nov 2007 19:34:11 +0000 Subject: [PATCH] compiles git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2120 29311d96-e01e-0410-9327-a35deaab8ce9 --- trunk/ceph/include/ceph_fs.h | 2 ++ trunk/ceph/kernel/client.c | 2 -- trunk/ceph/kernel/mds_client.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/trunk/ceph/include/ceph_fs.h b/trunk/ceph/include/ceph_fs.h index ecf2958110851..1d7884f315198 100644 --- a/trunk/ceph/include/ceph_fs.h +++ b/trunk/ceph/include/ceph_fs.h @@ -50,6 +50,8 @@ struct ceph_object { }; typedef struct ceph_object ceph_object_t; +#define CEPH_INO_ROOT 1 + struct ceph_timeval { __u32 tv_sec; __u32 tv_usec; diff --git a/trunk/ceph/kernel/client.c b/trunk/ceph/kernel/client.c index 85007f781e9c8..55da9dcea587b 100644 --- a/trunk/ceph/kernel/client.c +++ b/trunk/ceph/kernel/client.c @@ -59,8 +59,6 @@ static int mount(struct ceph_client *client, struct ceph_mount_args *args) int err; int attempts = 10; int which; - struct ceph_msg *open_msg; - struct ceph_msg *open_reply; client->mounting = 6; /* FIXME don't wait for osd map, for now */ diff --git a/trunk/ceph/kernel/mds_client.c b/trunk/ceph/kernel/mds_client.c index fe27d302a7236..4b8c0c4cd66af 100644 --- a/trunk/ceph/kernel/mds_client.c +++ b/trunk/ceph/kernel/mds_client.c @@ -336,11 +336,11 @@ int ceph_mdsc_do(struct ceph_mds_client *mdsc, int op, struct ceph_client_reply_head *head; int ret; - req = ceph_mdsc_create_request_msg(&client->mdsc, op, ino1, path1, ino2, path2); + req = ceph_mdsc_create_request_msg(mdsc, op, ino1, path1, ino2, path2); if (IS_ERR(req)) return PTR_ERR(req); - reply = ceph_mdsc_do_request(&client->mdsc, req, -1); + reply = ceph_mdsc_do_request(mdsc, req, -1); if (IS_ERR(reply)) return PTR_ERR(reply); @@ -530,6 +530,7 @@ int parse_reply_info(struct ceph_msg *msg, struct reply_info *info) /* trace */ p = msg->front.iov_base + sizeof(struct ceph_client_reply_head); + end = p + msg->front.iov_len; if ((err = ceph_decode_32(&p, end, &len)) < 0) goto bad; if (len > 0 && -- 2.39.5