diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
tree | 517290fd884d286fe2971137ac89f89e3567785a /fs/xfs/xfs_dir2_sf.h | |
parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'fs/xfs/xfs_dir2_sf.h')
-rw-r--r-- | fs/xfs/xfs_dir2_sf.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/xfs/xfs_dir2_sf.h b/fs/xfs/xfs_dir2_sf.h index deecc9d238f..6ac44b550d3 100644 --- a/fs/xfs/xfs_dir2_sf.h +++ b/fs/xfs/xfs_dir2_sf.h | |||
@@ -34,13 +34,6 @@ struct xfs_mount; | |||
34 | struct xfs_trans; | 34 | struct xfs_trans; |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Maximum size of a shortform directory. | ||
38 | */ | ||
39 | #define XFS_DIR2_SF_MAX_SIZE \ | ||
40 | (XFS_DINODE_MAX_SIZE - (uint)sizeof(xfs_dinode_core_t) - \ | ||
41 | (uint)sizeof(xfs_agino_t)) | ||
42 | |||
43 | /* | ||
44 | * Inode number stored as 8 8-bit values. | 37 | * Inode number stored as 8 8-bit values. |
45 | */ | 38 | */ |
46 | typedef struct { __uint8_t i[8]; } xfs_dir2_ino8_t; | 39 | typedef struct { __uint8_t i[8]; } xfs_dir2_ino8_t; |