From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 21:31:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D6C771065696;
Mon, 9 Nov 2009 21:31:50 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 6F0878FC18;
Mon, 9 Nov 2009 21:31:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9LVoZX035122;
Mon, 9 Nov 2009 21:31:50 GMT (envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9LVohT035120;
Mon, 9 Nov 2009 21:31:50 GMT (envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911092131.nA9LVohT035120@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Mon, 9 Nov 2009 21:31:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199111 -
projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 21:31:50 -0000
Author: rdivacky
Date: Mon Nov 9 21:31:50 2009
New Revision: 199111
URL: http://svn.freebsd.org/changeset/base/199111
Log:
Revert back to what HEAD provides. Clang can compile it just fine.
Modified:
projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
Modified: projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
==============================================================================
--- projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Mon Nov 9 21:30:45 2009 (r199110)
+++ projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Mon Nov 9 21:31:50 2009 (r199111)
@@ -1232,6 +1232,7 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_
return (0);
}
+#pragma weak dmu_buf_will_dirty = dbuf_will_dirty
void
dbuf_will_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
{
@@ -1245,7 +1246,6 @@ dbuf_will_dirty(dmu_buf_impl_t *db, dmu_
(void) dbuf_read(db, NULL, rf);
(void) dbuf_dirty(db, tx);
}
-__weak_reference(dbuf_will_dirty, dmu_buf_will_dirty);
void
dmu_buf_will_fill(dmu_buf_t *db_fake, dmu_tx_t *tx)
@@ -1264,6 +1264,7 @@ dmu_buf_will_fill(dmu_buf_t *db_fake, dm
(void) dbuf_dirty(db, tx);
}
+#pragma weak dmu_buf_fill_done = dbuf_fill_done
/* ARGSUSED */
void
dbuf_fill_done(dmu_buf_impl_t *db, dmu_tx_t *tx)
@@ -1284,7 +1285,6 @@ dbuf_fill_done(dmu_buf_impl_t *db, dmu_t
}
mutex_exit(&db->db_mtx);
}
-__weak_reference(dbuf_fill_done, dmu_buf_fill_done);
/*
* "Clear" the contents of this dbuf. This will mark the dbuf
@@ -1707,14 +1707,15 @@ dbuf_create_bonus(dnode_t *dn)
dn->dn_bonus = dbuf_create(dn, 0, DB_BONUS_BLKID, dn->dn_dbuf, NULL);
}
+#pragma weak dmu_buf_add_ref = dbuf_add_ref
void
dbuf_add_ref(dmu_buf_impl_t *db, void *tag)
{
int64_t holds = refcount_add(&db->db_holds, tag);
ASSERT(holds > 1);
}
-__weak_reference(dbuf_add_ref, dmu_buf_add_ref);
+#pragma weak dmu_buf_rele = dbuf_rele
void
dbuf_rele(dmu_buf_impl_t *db, void *tag)
{
@@ -1767,14 +1768,13 @@ dbuf_rele(dmu_buf_impl_t *db, void *tag)
mutex_exit(&db->db_mtx);
}
}
-__weak_reference(dbuf_rele, dmu_buf_rele);
+#pragma weak dmu_buf_refcount = dbuf_refcount
uint64_t
dbuf_refcount(dmu_buf_impl_t *db)
{
return (refcount_count(&db->db_holds));
}
-__weak_reference(dbuf_refcount, dmu_buf_refcount);
void *
dmu_buf_set_user(dmu_buf_t *db_fake, void *user_ptr, void *user_data_ptr_ptr,