[src/trunk]: src/sys/ufs/lfs Correct confusion between i_flag and i_flags

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

details:   https://anonhg.NetBSD.org/src/rev/f65706bd8cda
branches:  trunk
changeset: 824429:f65706bd8cda
user:      maya <maya%NetBSD.org@localhost>
date:      Mon Jun 05 01:29:21 2017 +0000

description:
Correct confusion between i_flag and i_flags
These will have to be renamed.

Spotted by Riastradh, thanks!

diffstat:

 sys/ufs/lfs/lfs_inode.c |   8 ++++----
 sys/ufs/lfs/lfs_pages.c |  16 ++++++++--------
 sys/ufs/lfs/lfs_vnops.c |  18 +++++++++---------
 3 files changed, 21 insertions(+), 21 deletions(-)

diffs (149 lines):

diff -r 98342c0d1ba8 -r f65706bd8cda sys/ufs/lfs/lfs_inode.c
--- a/sys/ufs/lfs/lfs_inode.c   Mon Jun 05 01:01:42 2017 +0000
+++ b/sys/ufs/lfs/lfs_inode.c   Mon Jun 05 01:29:21 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_inode.c,v 1.155 2017/04/01 00:40:42 maya Exp $     */
+/*     $NetBSD: lfs_inode.c,v 1.156 2017/06/05 01:29:21 maya Exp $     */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.155 2017/04/01 00:40:42 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.156 2017/06/05 01:29:21 maya Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -592,8 +592,8 @@
        /*
         * If we truncated to zero, take us off the paging queue.
         */
-       if (oip->i_size == 0 && oip->i_flags & IN_PAGING) {
-               oip->i_flags &= ~IN_PAGING;
+       if (oip->i_size == 0 && oip->i_flag & IN_PAGING) {
+               oip->i_flag &= ~IN_PAGING;
                TAILQ_REMOVE(&fs->lfs_pchainhd, oip, i_lfs_pchain);
        }
        mutex_exit(&lfs_lock);
diff -r 98342c0d1ba8 -r f65706bd8cda sys/ufs/lfs/lfs_pages.c
--- a/sys/ufs/lfs/lfs_pages.c   Mon Jun 05 01:01:42 2017 +0000
+++ b/sys/ufs/lfs/lfs_pages.c   Mon Jun 05 01:29:21 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_pages.c,v 1.12 2017/06/04 08:05:42 hannken Exp $   */
+/*     $NetBSD: lfs_pages.c,v 1.13 2017/06/05 01:29:21 maya Exp $      */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.12 2017/06/04 08:05:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.13 2017/06/05 01:29:21 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -506,8 +506,8 @@
                
                /* Remove us from paging queue, if we were on it */
                mutex_enter(&lfs_lock);
-               if (ip->i_flags & IN_PAGING) {
-                       ip->i_flags &= ~IN_PAGING;
+               if (ip->i_flag & IN_PAGING) {
+                       ip->i_flag &= ~IN_PAGING;
                        TAILQ_REMOVE(&fs->lfs_pchainhd, ip, i_lfs_pchain);
                }
                mutex_exit(&lfs_lock);
@@ -688,8 +688,8 @@
        if (pagedaemon) {
                mutex_exit(vp->v_interlock);
                mutex_enter(&lfs_lock);
-               if (!(ip->i_flags & IN_PAGING)) {
-                       ip->i_flags |= IN_PAGING;
+               if (!(ip->i_flag & IN_PAGING)) {
+                       ip->i_flag |= IN_PAGING;
                        TAILQ_INSERT_TAIL(&fs->lfs_pchainhd, ip, i_lfs_pchain);
                }
                cv_broadcast(&lfs_writerd_cv);
@@ -898,8 +898,8 @@
         */
        if (origendoffset == 0 || ap->a_flags & PGO_ALLPAGES) {
                mutex_enter(&lfs_lock);
-               if (ip->i_flags & IN_PAGING) {
-                       ip->i_flags &= ~IN_PAGING;
+               if (ip->i_flag & IN_PAGING) {
+                       ip->i_flag &= ~IN_PAGING;
                        TAILQ_REMOVE(&fs->lfs_pchainhd, ip, i_lfs_pchain);
                }
                mutex_exit(&lfs_lock);
diff -r 98342c0d1ba8 -r f65706bd8cda sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Mon Jun 05 01:01:42 2017 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Mon Jun 05 01:29:21 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.315 2017/05/26 14:21:02 riastradh Exp $        */
+/*     $NetBSD: lfs_vnops.c,v 1.316 2017/06/05 01:29:21 maya Exp $     */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.315 2017/05/26 14:21:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.316 2017/06/05 01:29:21 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -461,8 +461,8 @@
        if (ap->a_flags & FSYNC_LAZY) {
                if (lfs_ignore_lazy_sync == 0) {
                        mutex_enter(&lfs_lock);
-                       if (!(ip->i_flags & IN_PAGING)) {
-                               ip->i_flags |= IN_PAGING;
+                       if (!(ip->i_flag & IN_PAGING)) {
+                               ip->i_flag |= IN_PAGING;
                                TAILQ_INSERT_TAIL(&fs->lfs_pchainhd, ip,
                                                  i_lfs_pchain);
                        }
@@ -477,7 +477,7 @@
         * reuse it.  This prevents the cleaner from writing files twice
         * in the same partial segment, causing an accounting underflow.
         */
-       if (ap->a_flags & FSYNC_RECLAIM && ip->i_flags & IN_CLEANING) {
+       if (ap->a_flags & FSYNC_RECLAIM && ip->i_flag & IN_CLEANING) {
                lfs_vflush(vp);
        }
 
@@ -1446,10 +1446,10 @@
         * We shouldn't be on them.
         */
        mutex_enter(&lfs_lock);
-       if (ip->i_flags & IN_PAGING) {
+       if (ip->i_flag & IN_PAGING) {
                log(LOG_WARNING, "%s: reclaimed vnode is IN_PAGING\n",
                    lfs_sb_getfsmnt(fs));
-               ip->i_flags &= ~IN_PAGING;
+               ip->i_flag &= ~IN_PAGING;
                TAILQ_REMOVE(&fs->lfs_pchainhd, ip, i_lfs_pchain);
        }
        if (vp->v_uflag & VU_DIROP) {
@@ -1776,7 +1776,7 @@
 
                nip = TAILQ_NEXT(ip, i_lfs_pchain);
 
-               if (!(ip->i_flags & IN_PAGING))
+               if (!(ip->i_flag & IN_PAGING))
                        goto top;
 
                mutex_exit(&lfs_lock);
@@ -1792,7 +1792,7 @@
                ip = VTOI(vp);
                mutex_enter(&lfs_lock);
                if ((vp->v_uflag & VU_DIROP) != 0 || vp->v_type != VREG ||
-                   !(ip->i_flags & IN_PAGING)) {
+                   !(ip->i_flag & IN_PAGING)) {
                        mutex_exit(&lfs_lock);
                        vput(vp);
                        mutex_enter(&lfs_lock);