[XFS] cleanup fid types mess

Currently XFs has three different fid types: struct fid, struct xfs_fid
and struct xfs_fid2 with hte latter two beeing identicaly and the first
one beeing the same size but an unstructured array with the same size.

This patch consolidates all this to alway uuse struct xfs_fid.

This patch is required for an upcoming patch series from me that revamps
the nfs exporting code and introduces a Linux-wide struct fid.

SGI-PV: 970336
SGI-Modid: xfs-linux-melb:xfs-kern:29651a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index a5a8454f2a63..a1544597bcd3 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -1635,9 +1635,8 @@ int
 xfs_vget(
         xfs_mount_t     *mp,
         bhv_vnode_t     **vpp,
-        fid_t           *fidp)
+        xfs_fid_t       *xfid)
 {
-        xfs_fid_t       *xfid = (struct xfs_fid *)fidp;
         xfs_inode_t     *ip;
         int             error;
         xfs_ino_t       ino;
@@ -1647,11 +1646,11 @@ xfs_vget(
          * Invalid.  Since handles can be created in user space and passed in
          * via gethandle(), this is not cause for a panic.
          */
-        if (xfid->xfs_fid_len != sizeof(*xfid) - sizeof(xfid->xfs_fid_len))
+        if (xfid->fid_len != sizeof(*xfid) - sizeof(xfid->fid_len))
                 return XFS_ERROR(EINVAL);
 
-        ino  = xfid->xfs_fid_ino;
-        igen = xfid->xfs_fid_gen;
+        ino  = xfid->fid_ino;
+        igen = xfid->fid_gen;
 
         /*
          * NFS can sometimes send requests for ino 0.  Fail them gracefully.