Page MenuHomeFreeBSD
Files F115786676

D35118.diff
No OneTemporary
Actions

D35118.diff
View Options

diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c
--- a/sbin/hastd/ebuf.c
+++ b/sbin/hastd/ebuf.c
@@ -70,12 +70,14 @@
ebuf_alloc(size_t size)
{
struct ebuf *eb;
+ size_t page_size;
int rerrno;
eb = malloc(sizeof(*eb));
if (eb == NULL)
return (NULL);
- size += PAGE_SIZE;
+ page_size = getpagesize();
+ size += page_size;
eb->eb_start = malloc(size);
if (eb->eb_start == NULL) {
rerrno = errno;
@@ -88,7 +90,7 @@
* We set start address for real data not at the first entry, because
* we want to be able to add data at the front.
*/
- eb->eb_used = eb->eb_start + PAGE_SIZE / 4;
+ eb->eb_used = eb->eb_start + page_size / 4;
eb->eb_size = 0;
eb->eb_magic = EBUF_MAGIC;
@@ -215,17 +217,18 @@
ebuf_head_extend(struct ebuf *eb, size_t size)
{
unsigned char *newstart, *newused;
- size_t newsize;
+ size_t newsize, page_size;
PJDLOG_ASSERT(eb != NULL && eb->eb_magic == EBUF_MAGIC);
- newsize = eb->eb_end - eb->eb_start + (PAGE_SIZE / 4) + size;
+ page_size = getpagesize();
+ newsize = eb->eb_end - eb->eb_start + (page_size / 4) + size;
newstart = malloc(newsize);
if (newstart == NULL)
return (-1);
newused =
- newstart + (PAGE_SIZE / 4) + size + (eb->eb_used - eb->eb_start);
+ newstart + (page_size / 4) + size + (eb->eb_used - eb->eb_start);
bcopy(eb->eb_used, newused, eb->eb_size);
@@ -243,11 +246,12 @@
ebuf_tail_extend(struct ebuf *eb, size_t size)
{
unsigned char *newstart;
- size_t newsize;
+ size_t newsize, page_size;
PJDLOG_ASSERT(eb != NULL && eb->eb_magic == EBUF_MAGIC);
- newsize = eb->eb_end - eb->eb_start + size + ((3 * PAGE_SIZE) / 4);
+ page_size = getpagesize();
+ newsize = eb->eb_end - eb->eb_start + size + ((3 * page_size) / 4);
newstart = realloc(eb->eb_start, newsize);
if (newstart == NULL)

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 29, 4:02 PM (4 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17842568
Default Alt Text
D35118.diff (1 KB)

Event Timeline