[XFS] remove VPURGE

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

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);
 	}
 }

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

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,

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);

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);

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);