From owner-svn-src-stable-7@FreeBSD.ORG  Sun Nov  1 17:15:39 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 001971065748;
	Sun,  1 Nov 2009 17:15:38 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE28E8FC13;
	Sun,  1 Nov 2009 17:15:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA1HFcm4028975;
	Sun, 1 Nov 2009 17:15:38 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA1HFcpG028973;
	Sun, 1 Nov 2009 17:15:38 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200911011715.nA1HFcpG028973@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 1 Nov 2009 17:15:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198755 - stable/7/usr.bin/fstat
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Nov 2009 17:15:39 -0000

Author: avg
Date: Sun Nov  1 17:15:38 2009
New Revision: 198755
URL: http://svn.freebsd.org/changeset/base/198755

Log:
  MFC 196399: fstat: fix fsid comparison on systems with 64-bit long

Modified:
  stable/7/usr.bin/fstat/   (props changed)
  stable/7/usr.bin/fstat/fstat.c
  stable/7/usr.bin/fstat/zfs.c

Modified: stable/7/usr.bin/fstat/fstat.c
==============================================================================
--- stable/7/usr.bin/fstat/fstat.c	Sun Nov  1 17:05:08 2009	(r198754)
+++ stable/7/usr.bin/fstat/fstat.c	Sun Nov  1 17:15:38 2009	(r198755)
@@ -649,7 +649,7 @@ devfs_filestat(struct vnode *vp, struct 
 		    (void *)devfs_dirent.de_vnode, Pid);
 		return 0;
 	}
-	fsp->fsid = (long)mount.mnt_stat.f_fsid.val[0];
+	fsp->fsid = (long)(uint32_t)mount.mnt_stat.f_fsid.val[0];
 	fsp->fileid = devfs_dirent.de_inode;
 	fsp->mode = (devfs_dirent.de_mode & ~S_IFMT) | S_IFCHR;
 	fsp->size = 0;

Modified: stable/7/usr.bin/fstat/zfs.c
==============================================================================
--- stable/7/usr.bin/fstat/zfs.c	Sun Nov  1 17:05:08 2009	(r198754)
+++ stable/7/usr.bin/fstat/zfs.c	Sun Nov  1 17:15:38 2009	(r198755)
@@ -117,7 +117,7 @@ zfs_filestat(struct vnode *vp, struct fi
 		goto bad;
 	}
 
-	fsp->fsid = (long)mount.mnt_stat.f_fsid.val[0];
+	fsp->fsid = (long)(uint32_t)mount.mnt_stat.f_fsid.val[0];
 	fsp->fileid = *zid;
 	/*
 	 * XXX: Shows up wrong in output, but UFS has this error too. Could