github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-02-17 05:02:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaks for 32bit systems

Browse Source
This commit is contained in:
Antonio SJ Musumeci 2022-11-04 09:10:48 -04:00
parent 83d7886a0a
commit 32e2c9c48e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libfuse/lib/fuse_lowlevel.c
View File

@ -307,21 +307,27 @@ fuse_reply_entry(fuse_req_t req,
return send_reply_ok(req, &arg, size); return send_reply_ok(req, &arg, size);
} }
struct fuse_create_out
{
struct fuse_entry_out e;
struct fuse_open_out o;
};
int int
fuse_reply_create(fuse_req_t req, fuse_reply_create(fuse_req_t req,
const struct fuse_entry_param *e, const struct fuse_entry_param *e,
const fuse_file_info_t *f) const fuse_file_info_t *f)
{ {
char buf[sizeof(struct fuse_entry_out) + sizeof(struct fuse_open_out)] = {0}; struct fuse_create_out buf = {0};
size_t entrysize = req->f->conn.proto_minor < 9 ? size_t entrysize = req->f->conn.proto_minor < 9 ?
FUSE_COMPAT_ENTRY_OUT_SIZE : sizeof(struct fuse_entry_out); FUSE_COMPAT_ENTRY_OUT_SIZE : sizeof(struct fuse_entry_out);
struct fuse_entry_out *earg = (struct fuse_entry_out *) buf; struct fuse_entry_out *earg = (struct fuse_entry_out*)&buf.e;
struct fuse_open_out *oarg = (struct fuse_open_out *) (buf + entrysize); struct fuse_open_out *oarg = (struct fuse_open_out*)(((char*)&buf)+entrysize);
fill_entry(earg, e); fill_entry(earg, e);
fill_open(oarg, f); fill_open(oarg, f);
return send_reply_ok(req, buf, entrysize + sizeof(struct fuse_open_out)); return send_reply_ok(req, &buf, entrysize + sizeof(struct fuse_open_out));
} }
int int

4
src/rnd.cpp
View File

@ -34,7 +34,9 @@ RND::RND()
gettimeofday(&tv,NULL); gettimeofday(&tv,NULL);
G_SEED = ((tv.tv_sec << 32) | (tv.tv_usec)); G_SEED = tv.tv_sec;
G_SEED <<= 32;
G_SEED |= tv.tv_usec;
} }
uint64_t uint64_t