[master] 496a4d6 Rearrange struct storage a bit, to bring it down to 64 bytes for SENDFILE_WORKS 64-bit platforms.

Poul-Henning Kamp phk at varnish-cache.org
Tue May 17 22:08:01 CEST 2011


commit 496a4d6d1cbfbd5ff08482f4acbb681364df9e70
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 17 20:07:31 2011 +0000

    Rearrange struct storage a bit, to bring it down to 64 bytes for
    SENDFILE_WORKS 64-bit platforms.

diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
index f7b9083..6a85ce6 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
@@ -374,6 +374,12 @@ struct workreq {
 struct storage {
 	unsigned		magic;
 #define STORAGE_MAGIC		0x1a4e51c0
+
+#ifdef SENDFILE_WORKS
+	int			fd;
+	off_t			where;
+#endif
+
 	VTAILQ_ENTRY(storage)	list;
 	struct stevedore	*stevedore;
 	void			*priv;
@@ -381,11 +387,6 @@ struct storage {
 	unsigned char		*ptr;
 	unsigned		len;
 	unsigned		space;
-
-#ifdef SENDFILE_WORKS
-	int			fd;
-	off_t			where;
-#endif
 };
 
 /* Object core structure ---------------------------------------------



More information about the varnish-commit mailing list