From owner-cvs-src@FreeBSD.ORG  Sun May 25 22:34:21 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC0391065755;
	Sun, 25 May 2008 22:34:18 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0915B8FC14;
	Sun, 25 May 2008 22:34:18 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4PMYHIx052985;
	Sun, 25 May 2008 22:34:17 GMT (envelope-from pjd@repoman.freebsd.org)
Received: (from pjd@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4PMYH6E052984;
	Sun, 25 May 2008 22:34:17 GMT (envelope-from pjd)
Message-Id: <200805252234.m4PMYH6E052984@repoman.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 25 May 2008 22:34:17 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 refcount.c spa_misc.c
 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys refcount.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 May 2008 22:34:22 -0000

pjd         2008-05-25 22:34:17 UTC

  FreeBSD src repository

  Modified files:
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs refcount.c 
                                                   spa_misc.c 
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys refcount.h 
  Log:
  Fix namespace collision after src/sys/sys/file.h:1.78.
  
  Revision  Changes    Path
  1.3       +1 -1      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
  1.4       +1 -1      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  1.3       +3 -2      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h