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

8 files changed, 33 insertions, 60 deletions

diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index 726449d4fd22..3586c7a28d2c 100644
--- 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 --git a/fs/xfs/linux-2.6/xfs_export.h b/fs/xfs/linux-2.6/xfs_export.h
index e794ca4efc76..2f36071a86f7 100644
--- a/fs/xfs/linux-2.6/xfs_export.h
+++ b/fs/xfs/linux-2.6/xfs_export.h
@@ -71,13 +71,13 @@ xfs_fileid_length(int hasparent, int is64)
 
 /*
  * Decode encoded inode information (either for the inode itself
- * or the parent) into an xfs_fid2_t structure.  Advances and
+ * or the parent) into an xfs_fid_t structure.  Advances and
  * returns the new data pointer
  */
 static inline __u32 *
-xfs_fileid_decode_fid2(__u32 *p, xfs_fid2_t *fid, int is64)
+xfs_fileid_decode_fid2(__u32 *p, xfs_fid_t *fid, int is64)
 {
-        fid->fid_len = sizeof(xfs_fid2_t) - sizeof(fid->fid_len);
+        fid->fid_len = sizeof(xfs_fid_t) - sizeof(fid->fid_len);
         fid->fid_pad = 0;
         fid->fid_ino = *p++;
 #if XFS_BIG_INUMS
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index ffec630e7db7..2b34bad48b07 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -152,11 +152,11 @@ xfs_find_handle(
                 lock_mode = xfs_ilock_map_shared(ip);
 
                 /* fill in fid section of handle from inode */
-                handle.ha_fid.xfs_fid_len = sizeof(xfs_fid_t) -
-                                            sizeof(handle.ha_fid.xfs_fid_len);
-                handle.ha_fid.xfs_fid_pad = 0;
-                handle.ha_fid.xfs_fid_gen = ip->i_d.di_gen;
-                handle.ha_fid.xfs_fid_ino = ip->i_ino;
+                handle.ha_fid.fid_len = sizeof(xfs_fid_t) -
+                                        sizeof(handle.ha_fid.fid_len);
+                handle.ha_fid.fid_pad = 0;
+                handle.ha_fid.fid_gen = ip->i_d.di_gen;
+                handle.ha_fid.fid_ino = ip->i_ino;
 
                 xfs_iunlock_map_shared(ip, lock_mode);
 
@@ -222,10 +222,10 @@ xfs_vget_fsop_handlereq(
         if (hlen < sizeof(*handlep))
                 memset(((char *)handlep) + hlen, 0, sizeof(*handlep) - hlen);
         if (hlen > sizeof(handlep->ha_fsid)) {
-                if (handlep->ha_fid.xfs_fid_len !=
-                                (hlen - sizeof(handlep->ha_fsid)
-                                        - sizeof(handlep->ha_fid.xfs_fid_len))
-                    || handlep->ha_fid.xfs_fid_pad)
+                if (handlep->ha_fid.fid_len !=
+                    (hlen - sizeof(handlep->ha_fsid) -
+                            sizeof(handlep->ha_fid.fid_len)) ||
+                    handlep->ha_fid.fid_pad)
                         return XFS_ERROR(EINVAL);
         }
 
@@ -233,9 +233,9 @@ xfs_vget_fsop_handlereq(
          * Crack the handle, obtain the inode # & generation #
          */
         xfid = (struct xfs_fid *)&handlep->ha_fid;
-        if (xfid->xfs_fid_len == sizeof(*xfid) - sizeof(xfid->xfs_fid_len)) {
-                ino  = xfid->xfs_fid_ino;
-                igen = xfid->xfs_fid_gen;
+        if (xfid->fid_len == sizeof(*xfid) - sizeof(xfid->fid_len)) {
+                ino  = xfid->fid_ino;
+                igen = xfid->fid_gen;
         } else {
                 return XFS_ERROR(EINVAL);
         }
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h
index ec3c9c27e0de..aab966276517 100644
--- a/fs/xfs/xfs_fs.h
+++ b/fs/xfs/xfs_fs.h
@@ -389,30 +389,13 @@ typedef struct xfs_fsop_attrmulti_handlereq {
  */
 typedef struct { __u32 val[2]; } xfs_fsid_t; /* file system id type */
 
-
-#ifndef HAVE_FID
-#define MAXFIDSZ        46
-
-typedef struct fid {
-        __u16           fid_len;                /* length of data in bytes */
-        unsigned char   fid_data[MAXFIDSZ];     /* data (fid_len worth)  */
-} fid_t;
-#endif
-
 typedef struct xfs_fid {
-        __u16   xfs_fid_len;            /* length of remainder  */
-        __u16   xfs_fid_pad;
-        __u32   xfs_fid_gen;            /* generation number    */
-        __u64   xfs_fid_ino;            /* 64 bits inode number */
+        __u16   fid_len;                /* length of remainder  */
+        __u16   fid_pad;
+        __u32   fid_gen;                /* generation number    */
+        __u64   fid_ino;                /* 64 bits inode number */
 } xfs_fid_t;
 
-typedef struct xfs_fid2 {
-        __u16   fid_len;        /* length of remainder */
-        __u16   fid_pad;        /* padding, must be zero */
-        __u32   fid_gen;        /* generation number */
-        __u64   fid_ino;        /* inode number */
-} xfs_fid2_t;
-
 typedef struct xfs_handle {
         union {
                 __s64       align;      /* force alignment of ha_fid     */
@@ -422,9 +405,9 @@ typedef struct xfs_handle {
 } xfs_handle_t;
 #define ha_fsid ha_u._ha_fsid
 
-#define XFS_HSIZE(handle)       (((char *) &(handle).ha_fid.xfs_fid_pad  \
+#define XFS_HSIZE(handle)       (((char *) &(handle).ha_fid.fid_pad      \
                                  - (char *) &(handle))                    \
-                                 + (handle).ha_fid.xfs_fid_len)
+                                 + (handle).ha_fid.fid_len)
 
 /*
  * Flags for going down operation
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.
diff --git a/fs/xfs/xfs_vfsops.h b/fs/xfs/xfs_vfsops.h
index bc99e3eb7dbb..a592fe02a339 100644
--- a/fs/xfs/xfs_vfsops.h
+++ b/fs/xfs/xfs_vfsops.h
@@ -2,7 +2,7 @@
 #define _XFS_VFSOPS_H 1
 
 struct cred;
-struct fid;
+struct xfs_fid;
 struct inode;
 struct kstatfs;
 struct xfs_mount;
@@ -17,7 +17,7 @@ int xfs_root(struct xfs_mount *mp, bhv_vnode_t **vpp);
 int xfs_statvfs(struct xfs_mount *mp, struct kstatfs *statp,
                 bhv_vnode_t *vp);
 int xfs_sync(struct xfs_mount *mp, int flags);
-int xfs_vget(struct xfs_mount *mp, bhv_vnode_t **vpp, struct fid *fidp);
+int xfs_vget(struct xfs_mount *mp, bhv_vnode_t **vpp, struct xfs_fid *xfid);
 int xfs_parseargs(struct xfs_mount *mp, char *options,
                 struct xfs_mount_args *args, int update);
 int xfs_showargs(struct xfs_mount *mp, struct seq_file *m);
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 5e3c57ca9981..efd5aff9eaf6 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -3466,23 +3466,14 @@ std_return:
 }
 
 
-/*
- * xfs_fid2
- *
- * A fid routine that takes a pointer to a previously allocated
- * fid structure (like xfs_fast_fid) but uses a 64 bit inode number.
- */
 int
 xfs_fid2(
         xfs_inode_t     *ip,
-        fid_t           *fidp)
+        xfs_fid_t       *xfid)
 {
-        xfs_fid2_t      *xfid = (xfs_fid2_t *)fidp;
-
         vn_trace_entry(ip, __FUNCTION__, (inst_t *)__return_address);
-        ASSERT(sizeof(fid_t) >= sizeof(xfs_fid2_t));
 
-        xfid->fid_len = sizeof(xfs_fid2_t) - sizeof(xfid->fid_len);
+        xfid->fid_len = sizeof(xfs_fid_t) - sizeof(xfid->fid_len);
         xfid->fid_pad = 0;
         /*
          * use memcpy because the inode is a long long and there's no
diff --git a/fs/xfs/xfs_vnodeops.h b/fs/xfs/xfs_vnodeops.h
index f36e74f2f0c2..b7e461c40cfb 100644
--- a/fs/xfs/xfs_vnodeops.h
+++ b/fs/xfs/xfs_vnodeops.h
@@ -39,7 +39,7 @@ int xfs_readdir(struct xfs_inode	*dp, void *dirent, size_t bufsize,
 int xfs_symlink(struct xfs_inode *dp, bhv_vname_t *dentry,
                 char *target_path, mode_t mode, bhv_vnode_t **vpp,
                 struct cred *credp);
-int xfs_fid2(struct xfs_inode *ip, fid_t        *fidp);
+int xfs_fid2(struct xfs_inode *ip, struct xfs_fid *xfid);
 int xfs_rwlock(struct xfs_inode *ip, bhv_vrwlock_t locktype);
 void xfs_rwunlock(struct xfs_inode *ip, bhv_vrwlock_t locktype);
 int xfs_inode_flush(struct xfs_inode *ip, int flags);