[src/trunk]: src/sbin/fsck_lfs dp->di_u.inumber -> dp->di_inumber

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ce63bc45439
branches:  trunk
changeset: 787267:5ce63bc45439
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jun 08 23:12:13 2013 +0000

description:
dp->di_u.inumber -> dp->di_inumber

Should have been part of the previous changeset that applied that
change to lfs.h. I'd quite like to know why the test build I ran
didn't trip on this.

diffstat:

 sbin/fsck_lfs/pass6.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r 1bd3888a78d8 -r 5ce63bc45439 sbin/fsck_lfs/pass6.c
--- a/sbin/fsck_lfs/pass6.c     Sat Jun 08 23:04:49 2013 +0000
+++ b/sbin/fsck_lfs/pass6.c     Sat Jun 08 23:12:13 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.29 2013/06/08 02:16:03 dholland Exp $   */
+/* $NetBSD: pass6.c,v 1.30 2013/06/08 23:12:13 dholland Exp $   */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -662,8 +662,8 @@
                        for (dp = (struct ulfs1_dinode *)ibbuf;
                             dp < (struct ulfs1_dinode *)ibbuf + INOPB(fs);
                             ++dp) {
-                               if (dp->di_u.inumber == 0 ||
-                                   dp->di_u.inumber == fs->lfs_ifile)
+                               if (dp->di_inumber == 0 ||
+                                   dp->di_inumber == fs->lfs_ifile)
                                        continue;
                                /* Basic sanity checks */
                                if (dp->di_nlink < 0 
@@ -679,7 +679,7 @@
                                        goto out;
                                }
 
-                               vp = vget(fs, dp->di_u.inumber);
+                               vp = vget(fs, dp->di_inumber);
 
                                /*
                                 * Four cases:
@@ -687,7 +687,7 @@
                                 *     If currently allocated, remove.
                                 */
                                if (dp->di_nlink == 0) {
-                                       remove_ino(vp, dp->di_u.inumber);
+                                       remove_ino(vp, dp->di_inumber);
                                        ++ndelfiles;
                                        continue;
                                }
@@ -701,7 +701,7 @@
                                        if (!(sp->ss_flags & SS_DIROP))
                                                pfatal("NEW FILE IN NON-DIROP PARTIAL SEGMENT");
                                        else {
-                                               inums[j++] = dp->di_u.inumber;
+                                               inums[j++] = dp->di_inumber;
                                                nnewfiles++;
                                        }
                                        continue;
@@ -712,11 +712,11 @@
                                 *     and proceed as in (2).
                                 */
                                if (vp && VTOI(vp)->i_ffs1_gen < dp->di_gen) {
-                                       remove_ino(vp, dp->di_u.inumber);
+                                       remove_ino(vp, dp->di_inumber);
                                        if (!(sp->ss_flags & SS_DIROP))
                                                pfatal("NEW FILE VERSION IN NON-DIROP PARTIAL SEGMENT");
                                        else {
-                                               inums[j++] = dp->di_u.inumber;
+                                               inums[j++] = dp->di_inumber;
                                                ndelfiles++;
                                                nnewfiles++;
                                        }