diff options
author | Christoph Hellwig <hch@lst.de> | 2006-06-09 00:48:37 -0400 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 00:48:37 -0400 |
commit | ff9901c1e7c7be06a99c59cfc3133d2316cbc957 (patch) | |
tree | d9cae983cf713d07ff65566e56beca52c21412d1 /fs/xfs/xfs_dir2_sf.c | |
parent | 3e57ecf640428c01ba1ed8c8fc538447ada1715b (diff) |
[XFS] endianess annotations for xfs_dir2_data_entry_t
SGI-PV: 943272
SGI-Modid: xfs-linux-melb:xfs-kern:25806a
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_dir2_sf.c')
-rw-r--r-- | fs/xfs/xfs_dir2_sf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c index d98a41d1fe63..06afa1b324cf 100644 --- a/fs/xfs/xfs_dir2_sf.c +++ b/fs/xfs/xfs_dir2_sf.c | |||
@@ -117,13 +117,13 @@ xfs_dir2_block_sfsize( | |||
117 | dep->name[0] == '.' && dep->name[1] == '.'; | 117 | dep->name[0] == '.' && dep->name[1] == '.'; |
118 | #if XFS_BIG_INUMS | 118 | #if XFS_BIG_INUMS |
119 | if (!isdot) | 119 | if (!isdot) |
120 | i8count += INT_GET(dep->inumber, ARCH_CONVERT) > XFS_DIR2_MAX_SHORT_INUM; | 120 | i8count += be64_to_cpu(dep->inumber) > XFS_DIR2_MAX_SHORT_INUM; |
121 | #endif | 121 | #endif |
122 | if (!isdot && !isdotdot) { | 122 | if (!isdot && !isdotdot) { |
123 | count++; | 123 | count++; |
124 | namelen += dep->namelen; | 124 | namelen += dep->namelen; |
125 | } else if (isdotdot) | 125 | } else if (isdotdot) |
126 | parent = INT_GET(dep->inumber, ARCH_CONVERT); | 126 | parent = be64_to_cpu(dep->inumber); |
127 | /* | 127 | /* |
128 | * Calculate the new size, see if we should give up yet. | 128 | * Calculate the new size, see if we should give up yet. |
129 | */ | 129 | */ |
@@ -229,13 +229,13 @@ xfs_dir2_block_to_sf( | |||
229 | * Skip . | 229 | * Skip . |
230 | */ | 230 | */ |
231 | if (dep->namelen == 1 && dep->name[0] == '.') | 231 | if (dep->namelen == 1 && dep->name[0] == '.') |
232 | ASSERT(INT_GET(dep->inumber, ARCH_CONVERT) == dp->i_ino); | 232 | ASSERT(be64_to_cpu(dep->inumber) == dp->i_ino); |
233 | /* | 233 | /* |
234 | * Skip .., but make sure the inode number is right. | 234 | * Skip .., but make sure the inode number is right. |
235 | */ | 235 | */ |
236 | else if (dep->namelen == 2 && | 236 | else if (dep->namelen == 2 && |
237 | dep->name[0] == '.' && dep->name[1] == '.') | 237 | dep->name[0] == '.' && dep->name[1] == '.') |
238 | ASSERT(INT_GET(dep->inumber, ARCH_CONVERT) == | 238 | ASSERT(be64_to_cpu(dep->inumber) == |
239 | XFS_DIR2_SF_GET_INUMBER(sfp, &sfp->hdr.parent)); | 239 | XFS_DIR2_SF_GET_INUMBER(sfp, &sfp->hdr.parent)); |
240 | /* | 240 | /* |
241 | * Normal entry, copy it into shortform. | 241 | * Normal entry, copy it into shortform. |
@@ -246,7 +246,7 @@ xfs_dir2_block_to_sf( | |||
246 | (xfs_dir2_data_aoff_t) | 246 | (xfs_dir2_data_aoff_t) |
247 | ((char *)dep - (char *)block)); | 247 | ((char *)dep - (char *)block)); |
248 | memcpy(sfep->name, dep->name, dep->namelen); | 248 | memcpy(sfep->name, dep->name, dep->namelen); |
249 | temp=INT_GET(dep->inumber, ARCH_CONVERT); | 249 | temp = be64_to_cpu(dep->inumber); |
250 | XFS_DIR2_SF_PUT_INUMBER(sfp, &temp, | 250 | XFS_DIR2_SF_PUT_INUMBER(sfp, &temp, |
251 | XFS_DIR2_SF_INUMBERP(sfep)); | 251 | XFS_DIR2_SF_INUMBERP(sfep)); |
252 | sfep = XFS_DIR2_SF_NEXTENTRY(sfp, sfep); | 252 | sfep = XFS_DIR2_SF_NEXTENTRY(sfp, sfep); |