aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_export.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2007-09-14 15:22:37 +1000
committerTim Shimmin <tes@chook.melbourne.sgi.com>2007-10-19 18:02:55 +1000
commitc6143911a7e0f8abef0319c801eb36718f57dfde (patch)
tree86138962b153b617b5c117797394e23337f979c7 /fs/xfs/linux-2.6/xfs_export.h
parent[XFS] fixups after behavior removal merge into mainline git (diff)
downloadlinux-dev-c6143911a7e0f8abef0319c801eb36718f57dfde.tar.xz
linux-dev-c6143911a7e0f8abef0319c801eb36718f57dfde.zip
[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>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_export.h')
-rw-r--r--fs/xfs/linux-2.6/xfs_export.h6
1 files changed, 3 insertions, 3 deletions
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