diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/ext4/ext4_extents.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/ext4/ext4_extents.h')
| -rw-r--r-- | fs/ext4/ext4_extents.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/ext4_extents.h b/fs/ext4/ext4_extents.h index 18cb67b2cbbc..f0c3ec85bd48 100644 --- a/fs/ext4/ext4_extents.h +++ b/fs/ext4/ext4_extents.h | |||
| @@ -241,5 +241,6 @@ extern int ext4_ext_search_left(struct inode *, struct ext4_ext_path *, | |||
| 241 | extern int ext4_ext_search_right(struct inode *, struct ext4_ext_path *, | 241 | extern int ext4_ext_search_right(struct inode *, struct ext4_ext_path *, |
| 242 | ext4_lblk_t *, ext4_fsblk_t *); | 242 | ext4_lblk_t *, ext4_fsblk_t *); |
| 243 | extern void ext4_ext_drop_refs(struct ext4_ext_path *); | 243 | extern void ext4_ext_drop_refs(struct ext4_ext_path *); |
| 244 | extern int ext4_ext_check_inode(struct inode *inode); | ||
| 244 | #endif /* _EXT4_EXTENTS */ | 245 | #endif /* _EXT4_EXTENTS */ |
| 245 | 246 | ||