[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>

diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index 726449d4fd223fc80817968e50c77d1e92f3977f..3586c7a28d2cb1cce5d631b2dd385a8144e3ea6e 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@ -54,8 +54,8 @@ xfs_fs_decode_fh(
                struct dentry   *de),
        void                    *context)
 {
-       xfs_fid2_t              ifid;
-       xfs_fid2_t              pfid;
+       xfs_fid_t               ifid;
+       xfs_fid_t               pfid;
        void                    *parent = NULL;
        int                     is64 = 0;
        __u32                   *p = fh;
@@ -144,7 +144,7 @@ xfs_fs_get_dentry(
        struct dentry           *result;
        int                     error;
 
-       error = xfs_vget(XFS_M(sb), &vp, (fid_t *)data);
+       error = xfs_vget(XFS_M(sb), &vp, data);
        if (error || vp == NULL)
                return ERR_PTR(-ESTALE) ;
 

diff --cc fs/xfs/linux-2.6/xfs_export.h
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_ioctl.c
Simple merge

diff --cc fs/xfs/xfs_fs.h
Simple merge

diff --cc fs/xfs/xfs_vfsops.c
Simple merge

diff --cc fs/xfs/xfs_vfsops.h
Simple merge

diff --cc fs/xfs/xfs_vnodeops.c
Simple merge

diff --cc fs/xfs/xfs_vnodeops.h
Simple merge