From owner-svn-src-projects@FreeBSD.ORG Sun Jul 26 08:18:40 2009 Return-Path: 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 8B40B106564A; Sun, 26 Jul 2009 08:18:40 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5F32B8FC1E; Sun, 26 Jul 2009 08:18:40 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6Q8IeQ0064151; Sun, 26 Jul 2009 08:18:40 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6Q8IeOd064147; Sun, 26 Jul 2009 08:18:40 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200907260818.n6Q8IeOd064147@svn.freebsd.org> From: Stanislav Sedov Date: Sun, 26 Jul 2009 08:18:40 +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: r195886 - projects/libprocstat/usr.bin/fstat 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jul 2009 08:18:40 -0000 Author: stas Date: Sun Jul 26 08:18:40 2009 New Revision: 195886 URL: http://svn.freebsd.org/changeset/base/195886 Log: - Use getvnodemount and getvnodedata wrapper functions instead of direct access to vnode. Modified: projects/libprocstat/usr.bin/fstat/common_kvm.c projects/libprocstat/usr.bin/fstat/common_kvm.h projects/libprocstat/usr.bin/fstat/msdosfs.c Modified: projects/libprocstat/usr.bin/fstat/common_kvm.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/common_kvm.c Sun Jul 26 08:14:01 2009 (r195885) +++ projects/libprocstat/usr.bin/fstat/common_kvm.c Sun Jul 26 08:18:40 2009 (r195886) @@ -111,16 +111,16 @@ devfs_filestat(kvm_t *kd, struct vnode * struct devfs_dirent devfs_dirent; struct mount mount; - if (!kvm_read_all(kd, (unsigned long)vp->v_data, &devfs_dirent, + if (!kvm_read_all(kd, (unsigned long)getvnodedata(vp), &devfs_dirent, sizeof(devfs_dirent))) { warnx("can't read devfs_dirent at %p", (void *)vp->v_data); return (1); } - if (!kvm_read_all(kd, (unsigned long)vp->v_mount, &mount, + if (!kvm_read_all(kd, (unsigned long)getvnodemount(vp), &mount, sizeof(mount))) { warnx("can't read mount at %p", - (void *)vp->v_mount); + (void *)getvnodemount(vp)); return (1); } vn->vn_fsid = (long)mount.mnt_stat.f_fsid.val[0]; @@ -194,7 +194,6 @@ dev2udev(kvm_t *kd, struct cdev *dev) } } -#ifdef ZFS void * getvnodedata(struct vnode *vp) { @@ -206,4 +205,3 @@ getvnodemount(struct vnode *vp) { return (vp->v_mount); } -#endif Modified: projects/libprocstat/usr.bin/fstat/common_kvm.h ============================================================================== --- projects/libprocstat/usr.bin/fstat/common_kvm.h Sun Jul 26 08:14:01 2009 (r195885) +++ projects/libprocstat/usr.bin/fstat/common_kvm.h Sun Jul 26 08:18:40 2009 (r195886) @@ -42,10 +42,8 @@ int isofs_filestat(kvm_t *kd, struct vno int msdosfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int nfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); -#ifdef ZFS int zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); void *getvnodedata(struct vnode *vp); struct mount *getvnodemount(struct vnode *vp); -#endif #endif /* __COMMON_KVM_H__ */ Modified: projects/libprocstat/usr.bin/fstat/msdosfs.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/msdosfs.c Sun Jul 26 08:14:01 2009 (r195885) +++ projects/libprocstat/usr.bin/fstat/msdosfs.c Sun Jul 26 08:18:40 2009 (r195886) @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); * VTODE is defined in denode.h only if _KERNEL is defined, but that leads to * header explosion */ -#define VTODE(vp) ((struct denode *)(vp)->v_data) +#define VTODE(vp) ((struct denode *)getvnodedata(vp)) #include "libprocstat.h" #include "common_kvm.h"