use FSYNC instead of doing iupdat directly

[unix-history] / usr / src / sys / ufs / ffs / ffs_vfsops.c

diff --git a/usr/src/sys/ufs/ffs/ffs_vfsops.c b/usr/src/sys/ufs/ffs/ffs_vfsops.c
index 700b71f..5eeefc4 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vfsops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vfsops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ffs_vfsops.c        7.25 (Berkeley) %G%
+ *     @(#)ffs_vfsops.c        7.29 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -335,19 +335,15 @@ ufs_unmount(mp, flags)
        if (flags & MNT_FORCE)
                return (EINVAL);
        ump = VFSTOUFS(mp);
        if (flags & MNT_FORCE)
                return (EINVAL);
        ump = VFSTOUFS(mp);

-#ifdef QUOTA
-       if ((error = iflush(dev, mp->m_qinod)) && !forcibly)
-#else
-       if ((error = iflush(dev)) && !forcibly)
-#endif
+       if (error = vflush(mp, ITOV(ump->um_qinod), flags))

                return (error);
 #ifdef QUOTA
        (void) closedq(ump);
        /*
                return (error);
 #ifdef QUOTA
        (void) closedq(ump);
        /*

-        * Here we have to iflush again to get rid of the quota inode.

         * A drag, but it would be ugly to cheat, & this doesn't happen often.
         */
         * A drag, but it would be ugly to cheat, & this doesn't happen often.
         */

-       (void) iflush(mp, (struct inode *)NULL);
+       if (vflush(mp, (struct vnode *)NULL, MNT_NOFORCE))
+               panic("ufs_unmount: quota");

 #endif
        fs = ump->um_fs;
        ronly = !fs->fs_ronly;
 #endif
        fs = ump->um_fs;
        ronly = !fs->fs_ronly;


@@ -395,7 +391,6 @@ ufs_statfs(mp, sbp)
        if (fs->fs_magic != FS_MAGIC)
                panic("ufs_statfs");
        sbp->f_type = MOUNT_UFS;
        if (fs->fs_magic != FS_MAGIC)
                panic("ufs_statfs");
        sbp->f_type = MOUNT_UFS;

-       sbp->f_flags = mp->m_flag &~ (M_MLOCK|M_MWAIT);

        sbp->f_fsize = fs->fs_fsize;
        sbp->f_bsize = fs->fs_bsize;
        sbp->f_blocks = fs->fs_dsize;
        sbp->f_fsize = fs->fs_fsize;
        sbp->f_bsize = fs->fs_bsize;
        sbp->f_blocks = fs->fs_dsize;


@@ -405,7 +400,6 @@ ufs_statfs(mp, sbp)
                (fs->fs_dsize - sbp->f_bfree);
        sbp->f_files =  fs->fs_ncg * fs->fs_ipg - ROOTINO;
        sbp->f_ffree = fs->fs_cstotal.cs_nifree;
                (fs->fs_dsize - sbp->f_bfree);
        sbp->f_files =  fs->fs_ncg * fs->fs_ipg - ROOTINO;
        sbp->f_ffree = fs->fs_cstotal.cs_nifree;

-       sbp->f_fsid = mp->m_fsid;

        bcopy((caddr_t)fs->fs_fsmnt, (caddr_t)&sbp->f_mntonname[0], MNAMELEN);
        bcopy((caddr_t)ump->um_mntname, (caddr_t)&sbp->f_mntfromname[0],
                MNAMELEN);
        bcopy((caddr_t)fs->fs_fsmnt, (caddr_t)&sbp->f_mntonname[0], MNAMELEN);
        bcopy((caddr_t)ump->um_mntname, (caddr_t)&sbp->f_mntfromname[0],
                MNAMELEN);


@@ -427,7 +421,7 @@ ufs_sync(mp, waitfor)
        register struct inode *ip;
        register struct ufsmount *ump = VFSTOUFS(mp);
        register struct fs *fs;
        register struct inode *ip;
        register struct ufsmount *ump = VFSTOUFS(mp);
        register struct fs *fs;

-       int error = 0;
+       int error, allerror = 0;

        static int updlock = 0;
 
        if (syncprt)
        static int updlock = 0;
 
        if (syncprt)


@@ -457,20 +451,21 @@ ufs_sync(mp, waitfor)
         */
        for (vp = mp->m_mounth; vp; vp = vp->v_mountf) {
                ip = VTOI(vp);
         */
        for (vp = mp->m_mounth; vp; vp = vp->v_mountf) {
                ip = VTOI(vp);

-               if ((ip->i_flag & ILOCKED) != 0 || ITOV(ip)->v_count == 0 ||
+               if ((ip->i_flag & ILOCKED) != 0 || vp->v_count == 0 ||

                    (ip->i_flag & (IMOD|IACC|IUPD|ICHG)) == 0)
                        continue;
                    (ip->i_flag & (IMOD|IACC|IUPD|ICHG)) == 0)
                        continue;

-               ILOCK(ip);

                VREF(vp);
                VREF(vp);

-               error = iupdat(ip, &time, &time, waitfor == MNT_WAIT);
-               iput(ip);
+               VOP_LOCK(vp);
+               if (error = VOP_FSYNC(vp, 0, NOCRED, waitfor))
+                       allerror = error;
+               vput(vp);

        }
        updlock = 0;
        /*
         * Force stale buffer cache information to be flushed.
         */
        bflush(ump->um_devvp->v_mount);
        }
        updlock = 0;
        /*
         * Force stale buffer cache information to be flushed.
         */
        bflush(ump->um_devvp->v_mount);

-       return (error);
+       return (allerror);

 }
 
 /*
 }
 
 /*


@@ -654,8 +649,10 @@ getmdev(devvpp, fname, ndp)
                vput(vp);
                return (ENOTBLK);
        }
                vput(vp);
                return (ENOTBLK);
        }

-       if (major(vp->v_rdev) >= nblkdev)
+       if (major(vp->v_rdev) >= nblkdev) {
+               vput(vp);

                return (ENXIO);
                return (ENXIO);

+       }

        iunlock(VTOI(vp));
        *devvpp = vp;
        return (0);
        iunlock(VTOI(vp));
        *devvpp = vp;
        return (0);