From 55d7bf719458e1ca1dd033410133c8c186661e6c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Nov 2009 10:11:19 -0800 Subject: [PATCH] osdc: use __u64, not size_t size_t is too small on 32 bit platforms. --- src/osdc/Filer.cc | 2 +- src/osdc/Filer.h | 12 ++++++------ src/osdc/ObjectCacher.cc | 22 +++++++++++----------- src/osdc/ObjectCacher.h | 30 +++++++++++++++--------------- src/osdc/Objecter.cc | 2 +- src/osdc/Objecter.h | 6 +++--- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/osdc/Filer.cc b/src/osdc/Filer.cc index 0e6879636a573..cba7c126db1d0 100644 --- a/src/osdc/Filer.cc +++ b/src/osdc/Filer.cc @@ -211,7 +211,7 @@ void Filer::_probed(Probe *probe, const object_t& oid, __u64 size, utime_t mtime void Filer::file_to_extents(inodeno_t ino, ceph_file_layout *layout, - __u64 offset, size_t len, + __u64 offset, __u64 len, vector& extents) { dout(10) << "file_to_extents " << offset << "~" << len diff --git a/src/osdc/Filer.h b/src/osdc/Filer.h index 08b64dc3e031d..7ccfa4f9dd170 100644 --- a/src/osdc/Filer.h +++ b/src/osdc/Filer.h @@ -97,7 +97,7 @@ class Filer { * ranges in objects on (primary) osds) */ void file_to_extents(inodeno_t ino, ceph_file_layout *layout, - __u64 offset, size_t len, + __u64 offset, __u64 len, vector& extents); @@ -109,7 +109,7 @@ class Filer { ceph_file_layout *layout, snapid_t snap, __u64 offset, - size_t len, + __u64 len, bufferlist *bl, // ptr to data int flags, Context *onfinish) { @@ -125,7 +125,7 @@ class Filer { ceph_file_layout *layout, const SnapContext& snapc, __u64 offset, - size_t len, + __u64 len, bufferlist& bl, utime_t mtime, int flags, @@ -141,7 +141,7 @@ class Filer { ceph_file_layout *layout, const SnapContext& snapc, __u64 offset, - size_t len, + __u64 len, __u32 truncate_seq, utime_t mtime, int flags, @@ -178,7 +178,7 @@ class Filer { ceph_file_layout *layout, const SnapContext& snapc, __u64 offset, - size_t len, + __u64 len, utime_t mtime, int flags, Context *onack, @@ -208,7 +208,7 @@ class Filer { ceph_file_layout *layout, const SnapContext& snapc, __u64 offset, - size_t len, + __u64 len, utime_t mtime, int flags, Context *onack, diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 6418a9b810a41..3916410f87be8 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -444,7 +444,7 @@ void ObjectCacher::bh_read(BufferHead *bh) onfinish); } -void ObjectCacher::bh_read_finish(sobject_t oid, loff_t start, size_t length, bufferlist &bl) +void ObjectCacher::bh_read_finish(sobject_t oid, loff_t start, __u64 length, bufferlist &bl) { //lock.Lock(); dout(7) << "bh_read_finish " @@ -608,7 +608,7 @@ void ObjectCacher::lock_ack(list& oids, tid_t tid) } } -void ObjectCacher::bh_write_ack(sobject_t oid, loff_t start, size_t length, tid_t tid) +void ObjectCacher::bh_write_ack(sobject_t oid, loff_t start, __u64 length, tid_t tid) { //lock.Lock(); @@ -677,7 +677,7 @@ void ObjectCacher::bh_write_ack(sobject_t oid, loff_t start, size_t length, tid_ //lock.Unlock(); } -void ObjectCacher::bh_write_commit(sobject_t oid, loff_t start, size_t length, tid_t tid) +void ObjectCacher::bh_write_commit(sobject_t oid, loff_t start, __u64 length, tid_t tid) { //lock.Lock(); @@ -809,7 +809,7 @@ int ObjectCacher::readx(OSDRead *rd, inodeno_t ino, Context *onfinish) { bool success = true; list hit_ls; - map stripe_map; // final buffer offset -> substring + map<__u64, bufferlist> stripe_map; // final buffer offset -> substring for (vector::iterator ex_it = rd->extents.begin(); ex_it != rd->extents.end(); @@ -868,9 +868,9 @@ int ObjectCacher::readx(OSDRead *rd, inodeno_t ino, Context *onfinish) loff_t opos = ex_it->offset; map::iterator bh_it = hits.begin(); assert(bh_it->second->start() <= opos); - size_t bhoff = opos - bh_it->second->start(); + __u64 bhoff = opos - bh_it->second->start(); map<__u32,__u32>::iterator f_it = ex_it->buffer_extents.begin(); - size_t foff = 0; + __u64 foff = 0; while (1) { BufferHead *bh = bh_it->second; assert(opos == (loff_t)(bh->start() + bhoff)); @@ -880,7 +880,7 @@ int ObjectCacher::readx(OSDRead *rd, inodeno_t ino, Context *onfinish) << " frag " << f_it->first << "~" << f_it->second << " +" << foff << dendl; - size_t len = MIN(f_it->second - foff, + __u64 len = MIN(f_it->second - foff, bh->length() - bhoff); bufferlist bit; // put substr here first, since substr_of clobbers, and // we may get multiple bh's at this stripe_map position @@ -921,10 +921,10 @@ int ObjectCacher::readx(OSDRead *rd, inodeno_t ino, Context *onfinish) dout(10) << "readx has all buffers" << dendl; // ok, assemble into result buffer. - size_t pos = 0; + __u64 pos = 0; if (rd->bl) { rd->bl->clear(); - for (map::iterator i = stripe_map.begin(); + for (map<__u64,bufferlist>::iterator i = stripe_map.begin(); i != stripe_map.end(); i++) { assert(pos == i->first); @@ -972,7 +972,7 @@ int ObjectCacher::writex(OSDWrite *wr, inodeno_t ino) f_it != ex_it->buffer_extents.end(); f_it++) { dout(10) << "writex writing " << f_it->first << "~" << f_it->second << " into " << *bh << " at " << opos << dendl; - size_t bhoff = bh->start() - opos; + __u64 bhoff = bh->start() - opos; assert(f_it->second <= bh->length() - bhoff); // get the frag we're mapping in @@ -1006,7 +1006,7 @@ int ObjectCacher::writex(OSDWrite *wr, inodeno_t ino) // blocking wait for write. -bool ObjectCacher::wait_for_write(size_t len, Mutex& lock) +bool ObjectCacher::wait_for_write(__u64 len, Mutex& lock) { int blocked = 0; diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h index 9ab97e03d4654..0447c1dc05a41 100644 --- a/src/osdc/ObjectCacher.h +++ b/src/osdc/ObjectCacher.h @@ -415,19 +415,19 @@ class ObjectCacher { void wrunlock(Object *o); public: - void bh_read_finish(sobject_t oid, loff_t offset, size_t length, bufferlist &bl); - void bh_write_ack(sobject_t oid, loff_t offset, size_t length, tid_t t); - void bh_write_commit(sobject_t oid, loff_t offset, size_t length, tid_t t); + void bh_read_finish(sobject_t oid, loff_t offset, __u64 length, bufferlist &bl); + void bh_write_ack(sobject_t oid, loff_t offset, __u64 length, tid_t t); + void bh_write_commit(sobject_t oid, loff_t offset, __u64 length, tid_t t); void lock_ack(list& oids, tid_t tid); class C_ReadFinish : public Context { ObjectCacher *oc; sobject_t oid; loff_t start; - size_t length; + __u64 length; public: bufferlist bl; - C_ReadFinish(ObjectCacher *c, sobject_t o, loff_t s, size_t l) : oc(c), oid(o), start(s), length(l) {} + C_ReadFinish(ObjectCacher *c, sobject_t o, loff_t s, __u64 l) : oc(c), oid(o), start(s), length(l) {} void finish(int r) { oc->bh_read_finish(oid, start, length, bl); } @@ -437,10 +437,10 @@ class ObjectCacher { ObjectCacher *oc; sobject_t oid; loff_t start; - size_t length; + __u64 length; public: tid_t tid; - C_WriteAck(ObjectCacher *c, sobject_t o, loff_t s, size_t l) : oc(c), oid(o), start(s), length(l) {} + C_WriteAck(ObjectCacher *c, sobject_t o, loff_t s, __u64 l) : oc(c), oid(o), start(s), length(l) {} void finish(int r) { oc->bh_write_ack(oid, start, length, tid); } @@ -449,10 +449,10 @@ class ObjectCacher { ObjectCacher *oc; sobject_t oid; loff_t start; - size_t length; + __u64 length; public: tid_t tid; - C_WriteCommit(ObjectCacher *c, sobject_t o, loff_t s, size_t l) : oc(c), oid(o), start(s), length(l) {} + C_WriteCommit(ObjectCacher *c, sobject_t o, loff_t s, __u64 l) : oc(c), oid(o), start(s), length(l) {} void finish(int r) { oc->bh_write_commit(oid, start, length, tid); } @@ -525,7 +525,7 @@ class ObjectCacher { bool is_cached(inodeno_t ino, vector& extents, snapid_t snapid); // write blocking - bool wait_for_write(size_t len, Mutex& lock); + bool wait_for_write(__u64 len, Mutex& lock); // blocking. atomic+sync. int atomic_sync_readx(OSDRead *rd, inodeno_t ino, Mutex& lock); @@ -555,14 +555,14 @@ class ObjectCacher { /*** async+caching (non-blocking) file interface ***/ int file_is_cached(inodeno_t ino, ceph_file_layout *layout, snapid_t snapid, - loff_t offset, size_t len) { + loff_t offset, __u64 len) { vector extents; filer.file_to_extents(ino, layout, offset, len, extents); return is_cached(ino, extents, snapid); } int file_read(inodeno_t ino, ceph_file_layout *layout, snapid_t snapid, - loff_t offset, size_t len, + loff_t offset, __u64 len, bufferlist *bl, int flags, Context *onfinish) { @@ -572,7 +572,7 @@ class ObjectCacher { } int file_write(inodeno_t ino, ceph_file_layout *layout, const SnapContext& snapc, - loff_t offset, size_t len, + loff_t offset, __u64 len, bufferlist& bl, utime_t mtime, int flags) { OSDWrite *wr = prepare_write(snapc, bl, mtime, flags); filer.file_to_extents(ino, layout, offset, len, wr->extents); @@ -585,7 +585,7 @@ class ObjectCacher { int file_atomic_sync_read(inodeno_t ino, ceph_file_layout *layout, snapid_t snapid, - loff_t offset, size_t len, + loff_t offset, __u64 len, bufferlist *bl, int flags, Mutex &lock) { OSDRead *rd = prepare_read(snapid, bl, flags); @@ -595,7 +595,7 @@ class ObjectCacher { int file_atomic_sync_write(inodeno_t ino, ceph_file_layout *layout, const SnapContext& snapc, - loff_t offset, size_t len, + loff_t offset, __u64 len, bufferlist& bl, utime_t mtime, int flags, Mutex &lock) { OSDWrite *wr = prepare_write(snapc, bl, mtime, flags); diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index eb1f97d011163..91981cd5993c5 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -824,7 +824,7 @@ void Objecter::_sg_read_finish(vector& extents, vector bufferlist *bl, Context *onfinish) { // all done - size_t bytes_read = 0; + __u64 bytes_read = 0; dout(15) << "_sg_read_finish" << dendl; diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 87b046ab0aa6b..8042a39eeaace 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -480,7 +480,7 @@ private: } tid_t read(const object_t& oid, ceph_object_layout ol, - __u64 off, size_t len, snapid_t snap, bufferlist *pbl, int flags, + __u64 off, __u64 len, snapid_t snap, bufferlist *pbl, int flags, Context *onfinish) { vector ops(1); ops[0].op.op = CEPH_OSD_OP_READ; @@ -536,7 +536,7 @@ private: return op_submit(o); } tid_t write(const object_t& oid, ceph_object_layout ol, - __u64 off, size_t len, const SnapContext& snapc, const bufferlist &bl, + __u64 off, __u64 len, const SnapContext& snapc, const bufferlist &bl, utime_t mtime, int flags, Context *onack, Context *oncommit) { vector ops(1); @@ -563,7 +563,7 @@ private: return op_submit(o); } tid_t zero(const object_t& oid, ceph_object_layout ol, - __u64 off, size_t len, const SnapContext& snapc, utime_t mtime, int flags, + __u64 off, __u64 len, const SnapContext& snapc, utime_t mtime, int flags, Context *onack, Context *oncommit) { vector ops(1); ops[0].op.op = CEPH_OSD_OP_ZERO; -- 2.39.5