From owner-svn-src-all@FreeBSD.ORG  Mon Feb 27 17:41:24 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F93F106564A;
	Mon, 27 Feb 2012 17:41:24 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8E258FC0A;
	Mon, 27 Feb 2012 17:41:23 +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 q1RHfNtf029653;
	Mon, 27 Feb 2012 17:41:23 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1RHfNDL029651;
	Mon, 27 Feb 2012 17:41:23 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201202271741.q1RHfNDL029651@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Mon, 27 Feb 2012 17:41:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232234 - stable/9/usr.bin/fstat
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Feb 2012 17:41:24 -0000

Author: pluknet
Date: Mon Feb 27 17:41:23 2012
New Revision: 232234
URL: http://svn.freebsd.org/changeset/base/232234

Log:
  Backout r230934 (MFCed as r231859) which didn't work with unix sockets and
  several filesystem layers mounted at the specified path.
  
  Pointy hat to:	pluknet
  Reported by:	flo via broken tinderbox

Modified:
  stable/9/usr.bin/fstat/fstat.c
Directory Properties:
  stable/9/usr.bin/fstat/   (props changed)

Modified: stable/9/usr.bin/fstat/fstat.c
==============================================================================
--- stable/9/usr.bin/fstat/fstat.c	Mon Feb 27 17:39:34 2012	(r232233)
+++ stable/9/usr.bin/fstat/fstat.c	Mon Feb 27 17:41:23 2012	(r232234)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/queue.h>
-#include <sys/un.h>
 
 #include <netinet/in.h>
 
@@ -225,53 +224,28 @@ static void
 print_file_info(struct procstat *procstat, struct filestat *fst,
     const char *uname, const char *cmd, int pid)
 {
-	struct sockstat sock;
 	struct vnstat vn;
 	DEVS *d;
 	const char *filename;
 	int error, fsmatch = 0;
 	char errbuf[_POSIX2_LINE_MAX];
 
-	error = 0;
 	filename = NULL;
 	if (checkfile != 0) {
-		switch (fst->fs_type) {
-		case PS_FST_TYPE_VNODE:
-		case PS_FST_TYPE_FIFO:
-			error = procstat_get_vnode_info(procstat, fst, &vn, errbuf);
-			break;
-		case PS_FST_TYPE_SOCKET:
-			error = procstat_get_socket_info(procstat, fst, &sock, errbuf);
-			break;
-		default:
+		if (fst->fs_type != PS_FST_TYPE_VNODE &&
+		    fst->fs_type != PS_FST_TYPE_FIFO)
 			return;
-		}
+		error = procstat_get_vnode_info(procstat, fst, &vn, errbuf);
 		if (error != 0)
 			return;
 
 		for (d = devs; d != NULL; d = d->next)
-			switch (fst->fs_type) {
-			case PS_FST_TYPE_VNODE:
-			case PS_FST_TYPE_FIFO:			
-				if (d->fsid == vn.vn_fsid) {
-					fsmatch = 1;
-					if ((unsigned)d->ino == vn.vn_fileid) {
-						filename = d->name;
-						break;
-					}
-				}
-				break;
-			case PS_FST_TYPE_SOCKET:
-				if (sock.dom_family == AF_UNIX) {
-					fsmatch = 1;
-					if (strcmp(((struct sockaddr_un *)
-					    (&sock.sa_local))->sun_path,
-					    d->name) == 0) {
-						filename = d->name;
-						break;
-					}
+			if (d->fsid == vn.vn_fsid) {
+				fsmatch = 1;
+				if ((unsigned)d->ino == vn.vn_fileid) {
+					filename = d->name;
+					break;
 				}
-				break;
 			}
 		if (fsmatch == 0 || (filename == NULL && fsflg == 0))
 			return;