1 files changed, 6 insertions, 23 deletions

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