From owner-cvs-all@FreeBSD.ORG Thu Jun 12 08:31:57 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 809A7106564A; Thu, 12 Jun 2008 08:31:57 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B3088FC1B; Thu, 12 Jun 2008 08:31:57 +0000 (UTC) (envelope-from ed@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 m5C8Vv8r089150; Thu, 12 Jun 2008 08:31:57 GMT (envelope-from ed@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5C8VvKB089149; Thu, 12 Jun 2008 08:31:57 GMT (envelope-from ed@repoman.freebsd.org) Message-Id: <200806120831.m5C8VvKB089149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to ed@repoman.freebsd.org using -f From: Ed Schouten Date: Thu, 12 Jun 2008 08:30:54 +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 zfs_znode.c src/sys/kern kern_conf.c src/sys/sys conf.h systm.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jun 2008 08:31:57 -0000 ed 2008-06-12 08:30:54 UTC FreeBSD src repository Modified files: sys/cddl/contrib/opensolaris/uts/common/fs/zfs zfs_znode.c sys/kern kern_conf.c sys/sys conf.h systm.h Log: SVN rev 179757 on 2008-06-12 08:30:54Z by ed Turn dev2unit(), minor(), unit2minor() and minor2unit() into macro's. Now that we got rid of the minor-to-unit conversion and the constraints on device minor numbers, we can convert the functions that operate on minor and unit numbers to simple macro's. The unit2minor() and minor2unit() macro's are now no-ops. The ZFS code als defined a macro named `minor'. Change the ZFS code to use umajor() and uminor() here, as it is the correct approach to do this. Also add $FreeBSD$ to keep SVN happy. Approved by: philip (mentor), pjd Revision Changes Path 1.16 +3 -7 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c 1.217 +0 -35 src/sys/kern/kern_conf.c 1.241 +5 -3 src/sys/sys/conf.h 1.267 +0 -1 src/sys/sys/systm.h