From owner-svn-src-all@FreeBSD.ORG Sat Sep 15 19:28:55 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6C4741065672; Sat, 15 Sep 2012 19:28:55 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D6708FC0C; Sat, 15 Sep 2012 19:28:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8FJSt1O016323; Sat, 15 Sep 2012 19:28:55 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8FJSs1p016318; Sat, 15 Sep 2012 19:28:54 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201209151928.q8FJSs1p016318@svn.freebsd.org> From: Ed Schouten Date: Sat, 15 Sep 2012 19:28:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240539 - in head/sys: dev/drm2 dev/drm2/i915 fs/devfs mips/mips X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2012 19:28:55 -0000 Author: ed Date: Sat Sep 15 19:28:54 2012 New Revision: 240539 URL: http://svn.freebsd.org/changeset/base/240539 Log: Prefer __containerof() above member2struct(). The first does proper checking of the argument types, while the latter does not. Modified: head/sys/dev/drm2/drm_gem.c head/sys/dev/drm2/i915/i915_drv.h head/sys/fs/devfs/devfs_int.h head/sys/mips/mips/pmap.c Modified: head/sys/dev/drm2/drm_gem.c ============================================================================== --- head/sys/dev/drm2/drm_gem.c Sat Sep 15 19:17:19 2012 (r240538) +++ head/sys/dev/drm2/drm_gem.c Sat Sep 15 19:28:54 2012 (r240539) @@ -396,7 +396,7 @@ drm_gem_object_from_offset(struct drm_de (uintmax_t)offset); return (NULL); } - obj = member2struct(drm_gem_object, map_list, map_list); + obj = __containerof(map_list, struct drm_gem_object, map_list); return (obj); } Modified: head/sys/dev/drm2/i915/i915_drv.h ============================================================================== --- head/sys/dev/drm2/i915/i915_drv.h Sat Sep 15 19:17:19 2012 (r240538) +++ head/sys/dev/drm2/i915/i915_drv.h Sat Sep 15 19:28:54 2012 (r240539) @@ -889,7 +889,7 @@ struct drm_i915_gem_object { int pending_flip; }; -#define to_intel_bo(x) member2struct(drm_i915_gem_object, base, (x)) +#define to_intel_bo(x) __containerof(x, struct drm_i915_gem_object, base) /** * Request queue structure. Modified: head/sys/fs/devfs/devfs_int.h ============================================================================== --- head/sys/fs/devfs/devfs_int.h Sat Sep 15 19:17:19 2012 (r240538) +++ head/sys/fs/devfs/devfs_int.h Sat Sep 15 19:28:54 2012 (r240539) @@ -69,7 +69,7 @@ struct cdev_priv { LIST_HEAD(, cdev_privdata) cdp_fdpriv; }; -#define cdev2priv(c) member2struct(cdev_priv, cdp_c, c) +#define cdev2priv(c) __containerof(c, struct cdev_priv, cdp_c) struct cdev *devfs_alloc(int); int devfs_dev_exists(const char *); Modified: head/sys/mips/mips/pmap.c ============================================================================== --- head/sys/mips/mips/pmap.c Sat Sep 15 19:17:19 2012 (r240538) +++ head/sys/mips/mips/pmap.c Sat Sep 15 19:28:54 2012 (r240539) @@ -1629,7 +1629,7 @@ pmap_pvh_free(struct md_page *pvh, pmap_ pv = pmap_pvh_remove(pvh, pmap, va); KASSERT(pv != NULL, ("pmap_pvh_free: pv not found, pa %lx va %lx", - (u_long)VM_PAGE_TO_PHYS(member2struct(vm_page, md, pvh)), + (u_long)VM_PAGE_TO_PHYS(__containerof(pvh, struct vm_page, md)), (u_long)va)); free_pv_entry(pmap, pv); }