vinvalbuf and getblk take parameter to indicate interrupt

SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.67
SCCS-vsn: sys/ufs/ffs/ffs_vfsops.c 7.84

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index 27c00c9..af972ef 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_inode.c 7.66 (Berkeley) %G%
+ *     @(#)ffs_inode.c 7.67 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -212,7 +212,7 @@ ffs_truncate(ap)
                oip->i_db[i] = 0;
        oip->i_flag |= ICHG|IUPD;
        vflags = ((length > 0) ? V_SAVE : 0) | V_SAVEMETA;
                oip->i_db[i] = 0;
        oip->i_flag |= ICHG|IUPD;
        vflags = ((length > 0) ? V_SAVE : 0) | V_SAVEMETA;

-       allerror = vinvalbuf(ovp, vflags, ap->a_cred, ap->a_p);
+       allerror = vinvalbuf(ovp, vflags, ap->a_cred, ap->a_p, 0, 0);

        if (error = VOP_UPDATE(ovp, &tv, &tv, MNT_WAIT))
                allerror = error;
 
        if (error = VOP_UPDATE(ovp, &tv, &tv, MNT_WAIT))
                allerror = error;
 


@@ -363,7 +363,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
            fs->fs_dbsize);
 #else SECSIZE
        vp = ITOV(ip);
            fs->fs_dbsize);
 #else SECSIZE
        vp = ITOV(ip);

-       bp = getblk(vp, lbn, (int)fs->fs_bsize);
+       bp = getblk(vp, lbn, (int)fs->fs_bsize, 0, 0);

        if (bp->b_flags & (B_DONE | B_DELWRI)) {
                /* Braces must be here in case trace evaluates to nothing. */
                trace(TR_BREADHIT, pack(vp, fs->fs_bsize), lbn);
        if (bp->b_flags & (B_DONE | B_DELWRI)) {
                /* Braces must be here in case trace evaluates to nothing. */
                trace(TR_BREADHIT, pack(vp, fs->fs_bsize), lbn);

diff --git a/usr/src/sys/ufs/ffs/ffs_vfsops.c b/usr/src/sys/ufs/ffs/ffs_vfsops.c
index 2033a4a..ad006b9 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vfsops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_vfsops.c        7.83 (Berkeley) %G%
+ *     @(#)ffs_vfsops.c        7.84 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -245,7 +245,7 @@ ffs_reload(mountp, cred, p)
         * Step 1: invalidate all cached meta-data.
         */
        devvp = VFSTOUFS(mountp)->um_devvp;
         * Step 1: invalidate all cached meta-data.
         */
        devvp = VFSTOUFS(mountp)->um_devvp;

-       if (vinvalbuf(devvp, 0, cred, p))
+       if (vinvalbuf(devvp, 0, cred, p, 0, 0))

                panic("ffs_reload: dirty1");
        /*
         * Step 2: re-read superblock from disk.
                panic("ffs_reload: dirty1");
        /*
         * Step 2: re-read superblock from disk.


@@ -297,7 +297,7 @@ loop:
                 */
                if (vget(vp))
                        goto loop;
                 */
                if (vget(vp))
                        goto loop;

-               if (vinvalbuf(vp, 0, cred, p))
+               if (vinvalbuf(vp, 0, cred, p, 0, 0))

                        panic("ffs_reload: dirty2");
                /*
                 * Step 6: re-read inode data for all active vnodes.
                        panic("ffs_reload: dirty2");
                /*
                 * Step 6: re-read inode data for all active vnodes.


@@ -835,7 +835,7 @@ ffs_sbupdate(mp, waitfor)
        bp = getblk(mp->m_dev, (daddr_t)fsbtodb(fs, SBOFF / fs->fs_fsize),
            (int)fs->fs_sbsize, fs->fs_dbsize);
 #else SECSIZE
        bp = getblk(mp->m_dev, (daddr_t)fsbtodb(fs, SBOFF / fs->fs_fsize),
            (int)fs->fs_sbsize, fs->fs_dbsize);
 #else SECSIZE

-       bp = getblk(mp->um_devvp, SBLOCK, (int)fs->fs_sbsize);
+       bp = getblk(mp->um_devvp, SBLOCK, (int)fs->fs_sbsize, 0, 0);

 #endif SECSIZE
        bcopy((caddr_t)fs, bp->b_un.b_addr, (u_int)fs->fs_sbsize);
        /* Restore compatibility to old file systems.              XXX */
 #endif SECSIZE
        bcopy((caddr_t)fs, bp->b_un.b_addr, (u_int)fs->fs_sbsize);
        /* Restore compatibility to old file systems.              XXX */


@@ -862,7 +862,8 @@ ffs_sbupdate(mp, waitfor)
                bp = getblk(mp->m_dev, fsbtodb(fs, fs->fs_csaddr + i), size,
                    fs->fs_dbsize);
 #else SECSIZE
                bp = getblk(mp->m_dev, fsbtodb(fs, fs->fs_csaddr + i), size,
                    fs->fs_dbsize);
 #else SECSIZE

-               bp = getblk(mp->um_devvp, fsbtodb(fs, fs->fs_csaddr + i), size);
+               bp = getblk(mp->um_devvp, fsbtodb(fs, fs->fs_csaddr + i),
+                   size, 0, 0);

 #endif SECSIZE
                bcopy(space, bp->b_un.b_addr, (u_int)size);
                space += size;
 #endif SECSIZE
                bcopy(space, bp->b_un.b_addr, (u_int)size);
                space += size;