XFS: Revert VMAP() to the old IRIX prototype

Modid: 2.5.x-xfs:slinx:129878a

diff --git a/fs/xfs/linux/xfs_vnode.c b/fs/xfs/linux/xfs_vnode.c
index 95386e4a97294434a59673b97f9743b07b51dd04..133880636f54701149eaef8d3526820c00505bd3 100644 (file)
--- a/fs/xfs/linux/xfs_vnode.c
+++ b/fs/xfs/linux/xfs_vnode.c
@@ -397,8 +397,7 @@ vn_remove(struct vnode *vp)
         * After the following purge the vnode
         * will no longer exist.
         */
-       VMAP(vp, XFS_BHVTOI(vp->v_fbhv), vmap);
-
+       VMAP(vp, vmap);
        vn_purge(vp, &vmap);
 }
 

diff --git a/fs/xfs/linux/xfs_vnode.h b/fs/xfs/linux/xfs_vnode.h
index 97443cb9ffa05ab7d30666141d04b089bd3a4bee..dc76f19ca26868a3da733d0c1370bd63bd4b70e6 100644 (file)
--- a/fs/xfs/linux/xfs_vnode.h
+++ b/fs/xfs/linux/xfs_vnode.h
@@ -629,9 +629,10 @@ typedef struct vnode_map {
        xfs_ino_t       v_ino;                  /* inode #      */
 } vmap_t;
 
-#define VMAP(vp, ip, vmap)     {(vmap).v_vfsp   = (vp)->v_vfsp,        \
-                                (vmap).v_number = (vp)->v_number,      \
-                                (vmap).v_ino    = (ip)->i_ino; }
+#define VMAP(vp, vmap) {(vmap).v_vfsp   = (vp)->v_vfsp,        \
+                        (vmap).v_number = (vp)->v_number,      \
+                        (vmap).v_ino    = (vp)->v_inode.i_ino; }
+
 extern void    vn_purge(struct vnode *, vmap_t *);
 extern vnode_t *vn_get(struct vnode *, vmap_t *);
 extern int     vn_revalidate(struct vnode *);

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 0ee8eee147563d97bf60a035a1ebdd8a1f99ea49..bd343063b60ddf6bdde0b99cbcbc3a54277e0afa 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -3380,7 +3380,7 @@ xfs_iflush_all(
                         * entry in the list anyway so we'll know below
                         * whether we reached the end or not.
                         */
-                       VMAP(vp, ip, vmap);
+                       VMAP(vp, vmap);
                        vp->v_flag |= VPURGE;           /* OK for vn_purge */
                        XFS_MOUNT_IUNLOCK(mp);
 

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 2d0203b6836fa201e989bca682ff47e4614b3c37..2625226c73c71ff5369aaffbb87e2bc4f13277f8 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -911,7 +911,7 @@ xfs_mountfs(
        rvp = XFS_ITOV(rip);
        if ((rip->i_d.di_mode & IFMT) != IFDIR) {
                cmn_err(CE_WARN, "XFS: corrupted root inode");
-               VMAP(rvp, rip, vmap);
+               VMAP(rvp, vmap);
                prdev("Root inode %llu is not a directory",
                      mp->m_dev, (unsigned long long)rip->i_ino);
                rvp->v_flag |= VPURGE;
@@ -958,7 +958,7 @@ xfs_mountfs(
                 */
                cmn_err(CE_WARN, "XFS: failed to read RT inodes");
                rvp->v_flag |= VPURGE;
-               VMAP(rvp, rip, vmap);
+               VMAP(rvp, vmap);
                VN_RELE(rvp);
                vn_purge(rvp, &vmap);
                goto error3;

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 976aed6b46dda918f91794e394620d10c16f50bd..b3cfba7ecad0f9bab415ed1c62ba180c1962e793 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -1060,7 +1060,7 @@ again:
                         * Sample vp mapping while holding the mplock, lest
                         * we come across a non-existent vnode.
                         */
-                       VMAP(vp, ip, vmap);
+                       VMAP(vp, vmap);
                        ireclaims = mp->m_ireclaims;
                        topino = mp->m_inodes;
                        XFS_MOUNT_IUNLOCK(mp);

diff --git a/fs/xfs/xfs_quota_priv.h b/fs/xfs/xfs_quota_priv.h
index c7f8bb60e561743851c93a4aa762491db41f7f2d..d016d2b6cf8a3f9c1862886162223dad994f3afc 100644 (file)
--- a/fs/xfs/xfs_quota_priv.h
+++ b/fs/xfs/xfs_quota_priv.h
@@ -181,7 +181,7 @@ for ((dqp) = (qlist)->qh_next; (dqp) != (xfs_dquot_t *)(qlist); \
          vmap_t dqvmap;                \
          vnode_t *dqvp;                \
          dqvp = XFS_ITOV(ip);          \
-         VMAP(dqvp, ip, dqvmap);       \
+         VMAP(dqvp, dqvmap);           \
          VN_RELE(dqvp);                \
        }
 

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 6ddf6e0035d528a61bb4559f9fb2a9dc8f1ebe55..7f5526f4417cd8005722bd2b5048dbda30f68852 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -2322,7 +2322,7 @@ xfs_rtmount_inodes(
                vmap_t          vmap;           /* vmap to delete vnode */
 
                rbmvp = XFS_ITOV(mp->m_rbmip);
-               VMAP(rbmvp, mp->m_rbmip, vmap);
+               VMAP(rbmvp, vmap);
                VN_RELE(rbmvp);
                vn_purge(rbmvp, &vmap);
                return error;

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 60213a9540b68e11c943ab504e041611a0c68594..97f6f65feca6cce2c484ae6b5b6597b34b497ca8 100644 (file)
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -1115,7 +1115,7 @@ xfs_syncsub(
                         * in taking a snapshot of the vnode version number
                         * for use in calling vn_get().
                         */
-                       VMAP(vp, ip, vmap);
+                       VMAP(vp, vmap);
                        IPOINTER_INSERT(ip, mp);
 
                        vp = vn_get(vp, &vmap);