Module Name: src
Committed By: pgoyette
Date: Sat Jun 10 08:13:15 UTC 2017
Modified Files:
src/sbin/fsck_lfs: inode.c lfs.c pass6.c segwrite.c
Log Message:
Update inode member i_flag --> i_state to keep up with kernel changes
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.72 -r1.73 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.49 -r1.50 src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.45 -r1.46 src/sbin/fsck_lfs/segwrite.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/inode.c
diff -u src/sbin/fsck_lfs/inode.c:1.68 src/sbin/fsck_lfs/inode.c:1.69
--- src/sbin/fsck_lfs/inode.c:1.68 Mon Sep 21 01:24:23 2015
+++ src/sbin/fsck_lfs/inode.c Sat Jun 10 08:13:15 2017
@@ -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 @@ inocleanup(void)
void
inodirty(struct inode *ip)
{
- ip->i_flag |= IN_MODIFIED;
+ ip->i_state |= IN_MODIFIED;
}
void
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.72 src/sbin/fsck_lfs/lfs.c:1.73
--- src/sbin/fsck_lfs/lfs.c:1.72 Fri Sep 16 11:13:47 2016
+++ src/sbin/fsck_lfs/lfs.c Sat Jun 10 08:13:15 2017
@@ -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 @@ lfs_raw_vget(struct lfs * fs, ino_t ino,
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 @@ extend_ifile(struct lfs *fs)
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 @@ lfs_balloc(struct uvnode *vp, off_t star
(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_fragextend(struct uvnode *vp, int os
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);
Index: src/sbin/fsck_lfs/pass6.c
diff -u src/sbin/fsck_lfs/pass6.c:1.49 src/sbin/fsck_lfs/pass6.c:1.50
--- src/sbin/fsck_lfs/pass6.c:1.49 Sat Oct 3 08:29:21 2015
+++ src/sbin/fsck_lfs/pass6.c Sat Jun 10 08:13:15 2017
@@ -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 @@ rfw_update_single(struct uvnode *vp, dad
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)
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.45 src/sbin/fsck_lfs/segwrite.c:1.46
--- src/sbin/fsck_lfs/segwrite.c:1.45 Sat Oct 3 08:28:15 2015
+++ src/sbin/fsck_lfs/segwrite.c Sat Jun 10 08:13:15 2017
@@ -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 @@ lfs_writevnodes(struct lfs *fs, struct s
/*
* 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);
