RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-16 08:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@722 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
sage 2006-03-20 23:45:03 +00:00
parent 15133a636b
commit c061869ebc
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ceph/ebofs/BlockDevice.cc
View File

@ -51,12 +51,23 @@ inline ostream& operator<<(ostream& out, BlockDevice::biovec &bio)
block_t BlockDevice::get_num_blocks()
{
if (!num_blocks) {
// stat
struct stat st;
assert(fd > 0);
int r = ::fstat(fd, &st);
assert(r == 0);
num_blocks = st.st_size / (block_t)EBOFS_BLOCK_SIZE;
// ioctl block device?
ioctl(fd, BLKGETSIZE64, &num_blocks);
if (!num_blocks) {
// hmm, try stat!
struct stat st;
fstat(fd, &st);
num_blocks = st.st_size / (__uint64_t)EBOFS_BLOCK_SIZE;
}
if (g_conf.bdev_fake_max_mb &&
num_blocks > (block_t)g_conf.bdev_fake_max_mb * 256ULL) {
dout(0) << "faking dev size " << g_conf.bdev_fake_max_mb << " mb" << endl;
num_blocks = g_conf.bdev_fake_max_mb * 256;
}
}
return num_blocks;
}
@ -567,15 +578,7 @@ int BlockDevice::open(kicker *idle)
}*/
// figure size
__uint64_t bsize = 0;
ioctl(fd, BLKGETSIZE64, &bsize);
if (bsize == 0) {
// hmm, try stat!
struct stat st;
fstat(fd, &st);
bsize = st.st_size;
}
num_blocks = bsize / (__uint64_t)EBOFS_BLOCK_SIZE;
__uint64_t bsize = get_num_blocks();
dout(2) << "open " << bsize << " bytes, " << num_blocks << " blocks" << endl;

2
ceph/ebofs/Ebofs.cc
View File

@ -1814,7 +1814,7 @@ int Ebofs::write(object_t oid,
trim_bc();
ebofs_lock.Unlock();
return 0;
return len;
}