[patch] Support for gcc4.2.

zfs-fuse-0.4.0_beta1-gcc4.2.patch (text/plain), 6.72 KB, created by larstobi on 2008-03-14 20:30:11 UTC

diff -ur zfs-fuse-0.4.0_beta1.orig/src/lib/libzfscommon/include/sys/dbuf.h zfs-fuse-0.4.0_beta1/src/lib/libzfscommon/include/sys/dbuf.h
--- zfs-fuse-0.4.0_beta1.orig/src/lib/libzfscommon/include/sys/dbuf.h	2007-03-06 04:19:12.000000000 +0100
+++ zfs-fuse-0.4.0_beta1/src/lib/libzfscommon/include/sys/dbuf.h	2007-04-20 11:35:09.000000000 +0200
@@ -216,18 +216,18 @@
 dmu_buf_impl_t *dbuf_create_tlib(struct dnode *dn, char *data);
 dmu_buf_impl_t *dbuf_create_bonus(struct dnode *dn);
 
-dmu_buf_impl_t *dbuf_hold(struct dnode *dn, uint64_t blkid, void *tag);
+dmu_buf_impl_t *dbuf_hold(struct dnode *dn, uint64_t blkid, const void *tag);
 dmu_buf_impl_t *dbuf_hold_level(struct dnode *dn, int level, uint64_t blkid,
     void *tag);
 int dbuf_hold_impl(struct dnode *dn, uint8_t level, uint64_t blkid, int create,
-    void *tag, dmu_buf_impl_t **dbp);
+    const void *tag, dmu_buf_impl_t **dbp);
 
 void dbuf_prefetch(struct dnode *dn, uint64_t blkid);
 
 void dbuf_add_ref(dmu_buf_impl_t *db, void *tag);
 uint64_t dbuf_refcount(dmu_buf_impl_t *db);
 
-void dbuf_rele(dmu_buf_impl_t *db, void *tag);
+void dbuf_rele(dmu_buf_impl_t *db, const void *tag);
 
 dmu_buf_impl_t *dbuf_find(struct dnode *dn, uint8_t level, uint64_t blkid);
 
diff -ur zfs-fuse-0.4.0_beta1.orig/src/lib/libzfscommon/include/sys/dmu.h zfs-fuse-0.4.0_beta1/src/lib/libzfscommon/include/sys/dmu.h
--- zfs-fuse-0.4.0_beta1.orig/src/lib/libzfscommon/include/sys/dmu.h	2007-03-06 04:19:12.000000000 +0100
+++ zfs-fuse-0.4.0_beta1/src/lib/libzfscommon/include/sys/dmu.h	2007-04-20 11:34:14.000000000 +0200
@@ -326,8 +326,8 @@
  * individually with dmu_buf_rele.
  */
 int dmu_buf_hold_array_by_bonus(dmu_buf_t *db, uint64_t offset,
-    uint64_t length, int read, void *tag, int *numbufsp, dmu_buf_t ***dbpp);
-void dmu_buf_rele_array(dmu_buf_t **, int numbufs, void *tag);
+    uint64_t length, int read, const void *tag, int *numbufsp, dmu_buf_t ***dbpp);
+void dmu_buf_rele_array(dmu_buf_t **, int numbufs, const void *tag);
 
 /*
  * Returns NULL on success, or the existing user ptr if it's already
diff -ur zfs-fuse-0.4.0_beta1.orig/src/lib/libzfscommon/include/sys/refcount.h zfs-fuse-0.4.0_beta1/src/lib/libzfscommon/include/sys/refcount.h
--- zfs-fuse-0.4.0_beta1.orig/src/lib/libzfscommon/include/sys/refcount.h	2007-03-06 04:19:12.000000000 +0100
+++ zfs-fuse-0.4.0_beta1/src/lib/libzfscommon/include/sys/refcount.h	2007-04-20 11:38:44.000000000 +0200
@@ -46,7 +46,7 @@
 #if defined(DEBUG) || !defined(_KERNEL)
 typedef struct reference {
 	list_node_t ref_link;
-	void *ref_holder;
+	const void *ref_holder;
 	uint64_t ref_number;
 	uint8_t *ref_removed;
 } reference_t;
@@ -66,10 +66,10 @@
 void refcount_destroy_many(refcount_t *rc, uint64_t number);
 int refcount_is_zero(refcount_t *rc);
 int64_t refcount_count(refcount_t *rc);
-int64_t refcount_add(refcount_t *rc, void *holder_tag);
-int64_t refcount_remove(refcount_t *rc, void *holder_tag);
-int64_t refcount_add_many(refcount_t *rc, uint64_t number, void *holder_tag);
-int64_t refcount_remove_many(refcount_t *rc, uint64_t number, void *holder_tag);
+int64_t refcount_add(refcount_t *rc, const const void *holder_tag);
+int64_t refcount_remove(refcount_t *rc, const void *holder_tag);
+int64_t refcount_add_many(refcount_t *rc, uint64_t number, const void *holder_tag);
+int64_t refcount_remove_many(refcount_t *rc, uint64_t number, const void *holder_tag);
 
 void refcount_init(void);
 void refcount_fini(void);
diff -ur zfs-fuse-0.4.0_beta1.orig/src/lib/libzpool/dbuf.c zfs-fuse-0.4.0_beta1/src/lib/libzpool/dbuf.c
--- zfs-fuse-0.4.0_beta1.orig/src/lib/libzpool/dbuf.c	2007-03-06 04:19:12.000000000 +0100
+++ zfs-fuse-0.4.0_beta1/src/lib/libzpool/dbuf.c	2007-04-20 11:34:46.000000000 +0200
@@ -1535,7 +1535,7 @@
  */
 int
 dbuf_hold_impl(dnode_t *dn, uint8_t level, uint64_t blkid, int fail_sparse,
-    void *tag, dmu_buf_impl_t **dbp)
+    const void *tag, dmu_buf_impl_t **dbp)
 {
 	dmu_buf_impl_t *db, *parent = NULL;
 
@@ -1620,7 +1620,7 @@
 }
 
 dmu_buf_impl_t *
-dbuf_hold(dnode_t *dn, uint64_t blkid, void *tag)
+dbuf_hold(dnode_t *dn, uint64_t blkid, const void *tag)
 {
 	dmu_buf_impl_t *db;
 	int err = dbuf_hold_impl(dn, 0, blkid, FALSE, tag, &db);
@@ -1657,7 +1657,7 @@
 
 #pragma weak dmu_buf_rele = dbuf_rele
 void
-dbuf_rele(dmu_buf_impl_t *db, void *tag)
+dbuf_rele(dmu_buf_impl_t *db, const void *tag)
 {
 	int64_t holds;
 
diff -ur zfs-fuse-0.4.0_beta1.orig/src/lib/libzpool/dmu.c zfs-fuse-0.4.0_beta1/src/lib/libzpool/dmu.c
--- zfs-fuse-0.4.0_beta1.orig/src/lib/libzpool/dmu.c	2007-03-06 04:19:12.000000000 +0100
+++ zfs-fuse-0.4.0_beta1/src/lib/libzpool/dmu.c	2007-04-20 11:36:09.000000000 +0200
@@ -161,7 +161,7 @@
  */
 static int
 dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset,
-    uint64_t length, int read, void *tag, int *numbufsp, dmu_buf_t ***dbpp)
+    uint64_t length, int read, const void *tag, int *numbufsp, dmu_buf_t ***dbpp)
 {
 	dmu_buf_t **dbp;
 	uint64_t blkid, nblks, i;
@@ -238,7 +238,7 @@
 
 static int
 dmu_buf_hold_array(objset_t *os, uint64_t object, uint64_t offset,
-    uint64_t length, int read, void *tag, int *numbufsp, dmu_buf_t ***dbpp)
+    uint64_t length, int read, const void *tag, int *numbufsp, dmu_buf_t ***dbpp)
 {
 	dnode_t *dn;
 	int err;
@@ -257,7 +257,7 @@
 
 int
 dmu_buf_hold_array_by_bonus(dmu_buf_t *db, uint64_t offset,
-    uint64_t length, int read, void *tag, int *numbufsp, dmu_buf_t ***dbpp)
+    uint64_t length, int read, const void *tag, int *numbufsp, dmu_buf_t ***dbpp)
 {
 	dnode_t *dn = ((dmu_buf_impl_t *)db)->db_dnode;
 	int err;
@@ -269,7 +269,7 @@
 }
 
 void
-dmu_buf_rele_array(dmu_buf_t **dbp_fake, int numbufs, void *tag)
+dmu_buf_rele_array(dmu_buf_t **dbp_fake, int numbufs, const void *tag)
 {
 	int i;
 	dmu_buf_impl_t **dbp = (dmu_buf_impl_t **)dbp_fake;
diff -ur zfs-fuse-0.4.0_beta1.orig/src/lib/libzpool/refcount.c zfs-fuse-0.4.0_beta1/src/lib/libzpool/refcount.c
--- zfs-fuse-0.4.0_beta1.orig/src/lib/libzpool/refcount.c	2007-03-06 04:19:12.000000000 +0100
+++ zfs-fuse-0.4.0_beta1/src/lib/libzpool/refcount.c	2007-04-20 11:37:44.000000000 +0200
@@ -110,7 +110,7 @@
 }
 
 int64_t
-refcount_add_many(refcount_t *rc, uint64_t number, void *holder)
+refcount_add_many(refcount_t *rc, uint64_t number, const void *holder)
 {
 	reference_t *ref;
 	int64_t count;
@@ -132,13 +132,13 @@
 }
 
 int64_t
-refcount_add(refcount_t *rc, void *holder)
+refcount_add(refcount_t *rc, const void *holder)
 {
 	return (refcount_add_many(rc, 1, holder));
 }
 
 int64_t
-refcount_remove_many(refcount_t *rc, uint64_t number, void *holder)
+refcount_remove_many(refcount_t *rc, uint64_t number, const void *holder)
 {
 	reference_t *ref;
 	int64_t count;
@@ -186,7 +186,7 @@
 }
 
 int64_t
-refcount_remove(refcount_t *rc, void *holder)
+refcount_remove(refcount_t *rc, const void *holder)
 {
 	return (refcount_remove_many(rc, 1, holder));
 }