[XFS] remove VPURGE

SGI Modid: 2.5.x-xfs:slinx:131630a

diff --git a/fs/xfs/linux/xfs_super.c b/fs/xfs/linux/xfs_super.c
index 99dc983a75467c5f97be29f8ffd6dbf92e326a20..12e40ca9419a9fe7b31c0f4f0f91cb0e4420e113 100644 (file)
--- a/fs/xfs/linux/xfs_super.c
+++ b/fs/xfs/linux/xfs_super.c
@@ -739,7 +739,6 @@ linvfs_clear_inode(
                /*
                 * Do all our cleanup, and remove this vnode.
                 */
-               vp->v_flag |= VPURGE;
                vn_remove(vp);
        }
 }

diff --git a/fs/xfs/linux/xfs_vnode.c b/fs/xfs/linux/xfs_vnode.c
index 51a855c9a4a0eacf577c36248af869fff2876c6e..64a1f696338dde2ee823305fd4825e92c5bab33a 100644 (file)
--- a/fs/xfs/linux/xfs_vnode.c
+++ b/fs/xfs/linux/xfs_vnode.c
@@ -184,7 +184,6 @@ vn_get(struct vnode *vp, vmap_t *vmap)
                return NULL;
 
        vn_trace_exit(vp, "vn_get", (inst_t *)__return_address);
-       ASSERT((vp->v_flag & VPURGE) == 0);
 
        return vp;
 }
@@ -238,8 +237,6 @@ vn_purge(struct vnode *vp, vmap_t *vmap)
 {
        vn_trace_entry(vp, "vn_purge", (inst_t *)__return_address);
 
-       ASSERT(vp->v_flag & VPURGE);
-
 again:
        /*
         * Check whether vp has already been reclaimed since our caller

diff --git a/fs/xfs/linux/xfs_vnode.h b/fs/xfs/linux/xfs_vnode.h
index dc76f19ca26868a3da733d0c1370bd63bd4b70e6..2d43ec2417d76ad7ffdec01a7930fe5ef98b1e53 100644 (file)
--- a/fs/xfs/linux/xfs_vnode.h
+++ b/fs/xfs/linux/xfs_vnode.h
@@ -119,7 +119,6 @@ extern ushort               vttoif_tab[];
 #define VFRLOCKS        0x8000000      /* vnode has FR locks applied   */
 #define VENF_LOCKING   0x10000000      /* enf. mode FR locking in effect */
 #define VOPLOCK                0x20000000      /* oplock set on the vnode      */
-#define VPURGE         0x40000000      /* In the linux 'put' thread    */
 
 typedef enum vrwlock   { VRWLOCK_NONE, VRWLOCK_READ,
                          VRWLOCK_WRITE, VRWLOCK_WRITE_DIRECT,

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 45acdc3999c9bf6f275702772172747d3b145719..61e925c7bc1b622615d016b4e4f61f11d333e325 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -3384,7 +3384,6 @@ xfs_iflush_all(
                         * whether we reached the end or not.
                         */
                        VMAP(vp, vmap);
-                       vp->v_flag |= VPURGE;           /* OK for vn_purge */
                        XFS_MOUNT_IUNLOCK(mp);
 
                        vn_purge(vp, &vmap);

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index d90415b32ca345641227f07ac7a6e6e3ec2c5c95..966a3a4e5570f69c6b2c933c855a1f8fa2280dba 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -900,7 +900,6 @@ xfs_mountfs(
                VMAP(rvp, vmap);
                prdev("Root inode %llu is not a directory",
                      mp->m_dev, (unsigned long long)rip->i_ino);
-               rvp->v_flag |= VPURGE;
                xfs_iunlock(rip, XFS_ILOCK_EXCL);
                VN_RELE(rvp);
                vn_purge(rvp, &vmap);
@@ -936,7 +935,6 @@ xfs_mountfs(
                        (!quotaondisk ? "out quota" : ""),
                        (uquotaondisk ? " usrquota" : ""),
                        (gquotaondisk ? " grpquota" : ""));
-               rvp->v_flag |= VPURGE;
                VN_RELE(rvp);
                vn_remove(rvp);
                error = XFS_ERROR(EPERM);
@@ -951,7 +949,6 @@ xfs_mountfs(
                 * Free up the root inode.
                 */
                cmn_err(CE_WARN, "XFS: failed to read RT inodes");
-               rvp->v_flag |= VPURGE;
                VMAP(rvp, vmap);
                VN_RELE(rvp);
                vn_purge(rvp, &vmap);

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 1e7d5df2dd068376cddc0df7ba9337ee043c5074..91dc351b5d73b339833f1a673e6e657077777962 100644 (file)
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -589,7 +589,6 @@ xfs_unmount(
         * Drop the reference count, and then
         * run the vnode through vn_remove.
         */
-       rvp->v_flag |= VPURGE;                  /* OK for vn_purge */
        VN_RELE(rvp);
 
        vn_remove(rvp);