From 1b49ee3eb8c877858a1f6aed46946e85333e60d6 Mon Sep 17 00:00:00 2001 From: Pedro Martelletto Date: Wed, 28 Dec 2005 20:48:19 +0000 Subject: Use the DIP macros to uniformly access fields from UFS1 and UFS2 dinodes. No functional change, okay tedu@. --- usr.sbin/pstat/pstat.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'usr.sbin/pstat') diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index 8398c917138..ce6f1ca74d8 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pstat.c,v 1.55 2005/12/17 13:56:02 pedro Exp $ */ +/* $OpenBSD: pstat.c,v 1.56 2005/12/28 20:48:18 pedro Exp $ */ /* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */ /*- @@ -40,7 +40,7 @@ static char copyright[] = #if 0 from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94"; #else -static char *rcsid = "$OpenBSD: pstat.c,v 1.55 2005/12/17 13:56:02 pedro Exp $"; +static char *rcsid = "$OpenBSD: pstat.c,v 1.56 2005/12/28 20:48:18 pedro Exp $"; #endif #endif /* not lint */ @@ -394,16 +394,16 @@ ufs_print(struct vnode *vp) *flags = '\0'; (void)printf(" %6d %5s", ip->i_number, flagbuf); - type = ip->i_ffs_mode & S_IFMT; - if (S_ISCHR(ip->i_ffs_mode) || S_ISBLK(ip->i_ffs_mode)) + type = ip->i_ffs1_mode & S_IFMT; + if (S_ISCHR(ip->i_ffs1_mode) || S_ISBLK(ip->i_ffs1_mode)) if (usenumflag || - ((name = devname(ip->i_ffs_rdev, type)) == NULL)) + ((name = devname(ip->i_ffs1_rdev, type)) == NULL)) (void)printf(" %2d,%-2d", - major(ip->i_ffs_rdev), minor(ip->i_ffs_rdev)); + major(ip->i_ffs1_rdev), minor(ip->i_ffs1_rdev)); else (void)printf(" %7s", name); else - (void)printf(" %7qd", ip->i_ffs_size); + (void)printf(" %7qd", ip->i_ffs1_size); return (0); } -- cgit v1.2.3