diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:52:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:52:16 -0400 |
| commit | 3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e (patch) | |
| tree | 10587a53ab093fc498fa52651f8a7c1b2b99af60 /fs/ocfs2/uptodate.h | |
| parent | 6bbd9b6d694ff7242d63cda2faac4bd59ee4328e (diff) | |
| parent | eb35746ca5e2211569b91ebb44d55b88ec91f3b0 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Remove overzealous BUG_ON()
ocfs2: Don't print on unknown remote blocking call
ocfs2: Remove EXPERIMENTAL dependency
ocfs2: implement directory read-ahead
ocfs2: properly update i_mtime on buffered write
ocfs2: Fix directory link count checks in ocfs2_link()
ocfs2: move nlink check in ocfs2_mknod()
ocfs2: Fix heartbeat sector calculation
[PATCH] fs/ocfs2/ioctl.c should #include "ioctl.h"
ocfs2: add ext2 attributes
configfs: Prevent duplicate subsystem names.
Diffstat (limited to 'fs/ocfs2/uptodate.h')
| -rw-r--r-- | fs/ocfs2/uptodate.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/uptodate.h b/fs/ocfs2/uptodate.h index 01cd32d26b06..2e73206059a8 100644 --- a/fs/ocfs2/uptodate.h +++ b/fs/ocfs2/uptodate.h | |||
| @@ -40,5 +40,7 @@ void ocfs2_set_new_buffer_uptodate(struct inode *inode, | |||
| 40 | struct buffer_head *bh); | 40 | struct buffer_head *bh); |
| 41 | void ocfs2_remove_from_cache(struct inode *inode, | 41 | void ocfs2_remove_from_cache(struct inode *inode, |
| 42 | struct buffer_head *bh); | 42 | struct buffer_head *bh); |
| 43 | int ocfs2_buffer_read_ahead(struct inode *inode, | ||
| 44 | struct buffer_head *bh); | ||
| 43 | 45 | ||
| 44 | #endif /* OCFS2_UPTODATE_H */ | 46 | #endif /* OCFS2_UPTODATE_H */ |