diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /fs/jfs/jfs_dtree.h | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'fs/jfs/jfs_dtree.h')
| -rw-r--r-- | fs/jfs/jfs_dtree.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/jfs/jfs_dtree.h b/fs/jfs/jfs_dtree.h index cdac2d5bafeb..2545bb317235 100644 --- a/fs/jfs/jfs_dtree.h +++ b/fs/jfs/jfs_dtree.h | |||
| @@ -243,9 +243,6 @@ typedef union { | |||
| 243 | #define JFS_REMOVE 3 | 243 | #define JFS_REMOVE 3 |
| 244 | #define JFS_RENAME 4 | 244 | #define JFS_RENAME 4 |
| 245 | 245 | ||
| 246 | #define DIRENTSIZ(namlen) \ | ||
| 247 | ( (sizeof(struct dirent) - 2*(JFS_NAME_MAX+1) + 2*((namlen)+1) + 3) &~ 3 ) | ||
| 248 | |||
| 249 | /* | 246 | /* |
| 250 | * Maximum file offset for directories. | 247 | * Maximum file offset for directories. |
| 251 | */ | 248 | */ |