[src/trunk]: src/sbin/fsck_lfs Update inode member i_flag --> i_state to keep...

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

details:   https://anonhg.NetBSD.org/src/rev/02e9a3559bc9
branches:  trunk
changeset: 824589:02e9a3559bc9
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sat Jun 10 08:13:15 2017 +0000

description:
Update inode member i_flag --> i_state to keep up with kernel changes

diffstat:

 sbin/fsck_lfs/inode.c    |   4 ++--
 sbin/fsck_lfs/lfs.c      |  10 +++++-----
 sbin/fsck_lfs/pass6.c    |   4 ++--
 sbin/fsck_lfs/segwrite.c |   4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r b13dcbfed68a -r 02e9a3559bc9 sbin/fsck_lfs/inode.c
--- a/sbin/fsck_lfs/inode.c     Sat Jun 10 05:31:34 2017 +0000
+++ b/sbin/fsck_lfs/inode.c     Sat Jun 10 08:13:15 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.68 2015/09/21 01:24:23 dholland Exp $   */
+/* $NetBSD: inode.c,v 1.69 2017/06/10 08:13:15 pgoyette Exp $   */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -436,7 +436,7 @@
 void
 inodirty(struct inode *ip)
 {
-       ip->i_flag |= IN_MODIFIED;
+       ip->i_state |= IN_MODIFIED;
 }
 
 void
diff -r b13dcbfed68a -r 02e9a3559bc9 sbin/fsck_lfs/lfs.c
--- a/sbin/fsck_lfs/lfs.c       Sat Jun 10 05:31:34 2017 +0000
+++ b/sbin/fsck_lfs/lfs.c       Sat Jun 10 08:13:15 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.72 2016/09/16 11:13:47 christos Exp $ */
+/* $NetBSD: lfs.c,v 1.73 2017/06/10 08:13:15 pgoyette Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -366,7 +366,7 @@
        ip->i_number = ino;
        ip->i_lockf = 0;
        ip->i_lfs_effnblks = 0;
-       ip->i_flag = 0;
+       ip->i_state = 0;
 
        /* Load inode block and find inode */
        if (daddr > 0) {
@@ -952,7 +952,7 @@
        lfs_balloc(vp, lfs_dino_getsize(fs, ip->i_din), lfs_sb_getbsize(fs), &bp);
        lfs_dino_setsize(fs, ip->i_din,
            lfs_dino_getsize(fs, ip->i_din) + lfs_sb_getbsize(fs));
-       ip->i_flag |= IN_MODIFIED;
+       ip->i_state |= IN_MODIFIED;
        
        i = (blkno - lfs_sb_getsegtabsz(fs) - lfs_sb_getcleansz(fs)) *
                lfs_sb_getifpb(fs);
@@ -1058,7 +1058,7 @@
                                                    (bpp ? &bp : NULL))))
                                return (error);
                        lfs_dino_setsize(fs, ip->i_din, (lastblock + 1) * lfs_sb_getbsize(fs));
-                       ip->i_flag |= IN_CHANGE | IN_UPDATE;
+                       ip->i_state |= IN_CHANGE | IN_UPDATE;
                        if (bpp)
                                (void) VOP_BWRITE(bp);
                }
@@ -1252,7 +1252,7 @@
 
        lfs_sb_subbfree(fs, frags);
        ip->i_lfs_effnblks += frags;
-       ip->i_flag |= IN_CHANGE | IN_UPDATE;
+       ip->i_state |= IN_CHANGE | IN_UPDATE;
 
        if (bpp) {
                (*bpp)->b_data = erealloc((*bpp)->b_data, nsize);
diff -r b13dcbfed68a -r 02e9a3559bc9 sbin/fsck_lfs/pass6.c
--- a/sbin/fsck_lfs/pass6.c     Sat Jun 10 05:31:34 2017 +0000
+++ b/sbin/fsck_lfs/pass6.c     Sat Jun 10 08:13:15 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.49 2015/10/03 08:29:21 dholland Exp $   */
+/* $NetBSD: pass6.c,v 1.50 2017/06/10 08:13:15 pgoyette Exp $   */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
        u_int32_t oldsn, sn;
 
        ip = VTOI(vp);
-       ip->i_flag |= IN_MODIFIED;
+       ip->i_state |= IN_MODIFIED;
 
        error = ulfs_bmaparray(fs, vp, lbn, &daddr, a, &num);
        if (error)
diff -r b13dcbfed68a -r 02e9a3559bc9 sbin/fsck_lfs/segwrite.c
--- a/sbin/fsck_lfs/segwrite.c  Sat Jun 10 05:31:34 2017 +0000
+++ b/sbin/fsck_lfs/segwrite.c  Sat Jun 10 08:13:15 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.45 2015/10/03 08:28:15 dholland Exp $ */
+/* $NetBSD: segwrite.c,v 1.46 2017/06/10 08:13:15 pgoyette Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -1027,7 +1027,7 @@
                /*
                 * Write the inode/file if dirty and it's not the IFILE.
                 */
-               if (ip->i_flag & IN_ALLMOD || !LIST_EMPTY(&vp->v_dirtyblkhd)) {
+               if (ip->i_state & IN_ALLMOD || !LIST_EMPTY(&vp->v_dirtyblkhd)) {
                        if (ip->i_number != LFS_IFILE_INUM)
                                lfs_writefile(fs, sp, vp);
                        (void) lfs_writeinode(fs, sp, ip);