diff options
| author | Tobias Poschwatta <tp@fonz.de> | 2007-11-28 19:21:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-29 12:24:53 -0500 |
| commit | 6454d1f9038f708d7deef6270ed4ba5bb6e55869 (patch) | |
| tree | 447fc22433ed8f16af01353bc93abffc73bc6ddd /include/linux | |
| parent | 68576cf122bc5195c758ed295e78b5858472378a (diff) | |
fix up ext2_fs.h for userspace after reservations backport
In commit a686cd898bd999fd026a51e90fb0a3410d258ddb:
"Val's cross-port of the ext3 reservations code into ext2."
include/linux/ext2_fs.h got a new function whose return value is only
defined if __KERNEL__ is defined. Putting #ifdef __KERNEL__ around the
function seems to help, patch below.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ext2_fs.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index 0f6c86c634fd..84cec2aa9f1e 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h | |||
| @@ -563,11 +563,4 @@ enum { | |||
| 563 | ~EXT2_DIR_ROUND) | 563 | ~EXT2_DIR_ROUND) |
| 564 | #define EXT2_MAX_REC_LEN ((1<<16)-1) | 564 | #define EXT2_MAX_REC_LEN ((1<<16)-1) |
| 565 | 565 | ||
| 566 | static inline ext2_fsblk_t | ||
| 567 | ext2_group_first_block_no(struct super_block *sb, unsigned long group_no) | ||
| 568 | { | ||
| 569 | return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) + | ||
| 570 | le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block); | ||
| 571 | } | ||
| 572 | |||
| 573 | #endif /* _LINUX_EXT2_FS_H */ | 566 | #endif /* _LINUX_EXT2_FS_H */ |