From owner-svn-src-projects@FreeBSD.ORG  Wed Jul  8 18:37:05 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 57ACF1065687;
	Wed,  8 Jul 2009 18:37:05 +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 4733C8FC1B;
	Wed,  8 Jul 2009 18:37:05 +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 n68Ib5Gx059670;
	Wed, 8 Jul 2009 18:37:05 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n68Ib5rq059668;
	Wed, 8 Jul 2009 18:37:05 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200907081837.n68Ib5rq059668@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Wed, 8 Jul 2009 18:37:05 +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: r195476 - 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 &quot; projects&quot;
	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: Wed, 08 Jul 2009 18:37:05 -0000

Author: stas
Date: Wed Jul  8 18:37:05 2009
New Revision: 195476
URL: http://svn.freebsd.org/changeset/base/195476

Log:
  - Add dev id detection support for cd9660 filesystem.
  
  Obtained from:	fuser

Modified:
  projects/libprocstat/usr.bin/fstat/cd9660.c

Modified: projects/libprocstat/usr.bin/fstat/cd9660.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/cd9660.c	Wed Jul  8 17:43:58 2009	(r195475)
+++ projects/libprocstat/usr.bin/fstat/cd9660.c	Wed Jul  8 18:37:05 2009	(r195476)
@@ -50,6 +50,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/mount.h>
 
 #include <isofs/cd9660/cd9660_node.h>
+#define _KERNEL
+#include <isofs/cd9660/iso.h>
+#undef _KERNEL
 
 #include <kvm.h>
 #include <stdio.h>
@@ -61,20 +64,25 @@ int
 isofs_filestat(kvm_t *kd, struct vnode *vp, struct filestat *fsp)
 {
 	struct iso_node isonode;
+	struct iso_mnt mnt;
 
 	if (!kvm_read_all(kd, (unsigned long)VTOI(vp), &isonode,
 	    sizeof(isonode))) {
 		dprintf(stderr, "can't read iso_node at %p\n",
 		    (void *)VTOI(vp));
-		return 0;
+		return (0);
 	}
-#if 0
-	fsp->fsid = dev2udev(isonode.i_dev);
-#endif
+	if (!kvm_read_all(kd, (unsigned long)isonode.i_mnt, &mnt,
+	    sizeof(mnt))) {
+		dprintf(stderr, "can't read iso_mnt at %p\n",
+		    (void *)VTOI(vp));
+		return (0);
+	}
+	fsp->fsid = dev2udev(kd, mnt.im_dev);
 	fsp->mode = (mode_t)isonode.inode.iso_mode;
 	fsp->rdev = isonode.inode.iso_rdev;
 
 	fsp->fileid = (long)isonode.i_number;
 	fsp->size = (u_long)isonode.i_size;
-	return 1;
+	return (1);
 }