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

Merge branch 'master' into rados

Browse Source 
Conflicts:

	src/include/ceph_fs.h
This commit is contained in:
Sage Weil 2008-01-04 12:51:19 -08:00
commit 4aff23aa95
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ebofs/BlockDevice.cc
View File

@ -269,9 +269,9 @@ block_t BlockDevice::get_num_blocks()
assert(fd > 0);
int r;
uint64_t bytes = 0;
#ifdef BLKGETSIZE64
// ioctl block device
uint64_t bytes = 0;
r = ioctl(fd, BLKGETSIZE64, &bytes);
num_blocks = bytes / (uint64_t)EBOFS_BLOCK_SIZE;
if (r == 0) {

6
src/include/ceph_fs.h
View File

@ -228,10 +228,10 @@ struct ceph_msg_header {
__u32 seq; /* message seq# for this session */
__u32 type; /* message type */
struct ceph_entity_inst src, dst;
__u16 front_len;
__u16 data_off; /* sender: include full offset; receiver: mask against ~PAGE_MASK */
__u32 front_len;
__u32 data_off; /* sender: include full offset; receiver: mask against ~PAGE_MASK */
__u32 data_len; /* bytes of data payload */
};
} __attribute__ ((packed));
/*

12
src/kernel/messenger.h
View File

@ -203,9 +203,9 @@ static __inline__ void ceph_encode_header(struct ceph_msg_header *to, struct cep
to->type = cpu_to_le32(from->type);
ceph_encode_inst(&to->src, &from->src);
ceph_encode_inst(&to->dst, &from->dst);
to->front_len = cpu_to_le16(from->front_len);
to->data_off = cpu_to_le16(from->data_off);
to->data_len = cpu_to_le16(from->data_len);
to->front_len = cpu_to_le32(from->front_len);
to->data_off = cpu_to_le32(from->data_off);
to->data_len = cpu_to_le32(from->data_len);
}
static __inline__ void ceph_decode_header(struct ceph_msg_header *to)
{
@ -213,9 +213,9 @@ static __inline__ void ceph_decode_header(struct ceph_msg_header *to)
to->type = cpu_to_le32(to->type);
ceph_decode_inst(&to->src);
ceph_decode_inst(&to->dst);
to->front_len = cpu_to_le16(to->front_len);
to->data_off = cpu_to_le16(to->data_off);
to->data_len = cpu_to_le16(to->data_len);
to->front_len = cpu_to_le32(to->front_len);
to->data_off = cpu_to_le32(to->data_off);
to->data_len = cpu_to_le32(to->data_len);
}

7
src/msg/SimpleMessenger.cc
View File

@ -22,7 +22,7 @@
#include <sys/socket.h>
#include <netinet/tcp.h>
#include <asm/page.h>
#include <sys/user.h>
#include "config.h"
@ -124,8 +124,11 @@ int Rank::Accepter::start()
sockaddr_in listen_addr = g_my_addr.v.ipaddr;
/* socket creation */
listen_sd = socket(AF_INET, SOCK_STREAM, 0);
listen_sd = ::socket(AF_INET, SOCK_STREAM, 0);
assert(listen_sd > 0);
int on = 1;
::setsockopt(listen_sd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
/* bind to port */
int rc = ::bind(listen_sd, (struct sockaddr *) &listen_addr, sizeof(listen_addr));

5
web/source.body
View File

@ -11,11 +11,16 @@
You can check out a working copy (actually, clone the repository) with
<pre>
git clone git://ceph.newdream.net/ceph.git
</pre>
or
<pre>
git clone http://ceph.newdream.net/git/ceph.git
</pre>
To pull the latest,
<pre>
git pull
</pre>
You can browse the git repo at <a href="http://ceph.newdream.net/git">http://ceph.newdream.net/git</a>.
</div>
<h4>Build Targets</h4>