diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-05-18 19:40:42 -0400 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-05-18 19:40:42 -0400 |
| commit | 41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1 (patch) | |
| tree | 89eddf2dffadbbd13939f94eb8cd904a26279390 /fs/ocfs2/alloc.h | |
| parent | 316ce2ba8e74a7bb9153b9f93adc883cb1ceb9fd (diff) | |
| parent | 1a934c3e57594588c373aea858e4593cdfcba4f4 (diff) | |
Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window
Diffstat (limited to 'fs/ocfs2/alloc.h')
| -rw-r--r-- | fs/ocfs2/alloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/alloc.h b/fs/ocfs2/alloc.h index a55a27bb96a5..55762b554b99 100644 --- a/fs/ocfs2/alloc.h +++ b/fs/ocfs2/alloc.h | |||
| @@ -210,7 +210,7 @@ static inline void ocfs2_init_dealloc_ctxt(struct ocfs2_cached_dealloc_ctxt *c) | |||
| 210 | int ocfs2_cache_cluster_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, | 210 | int ocfs2_cache_cluster_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, |
| 211 | u64 blkno, unsigned int bit); | 211 | u64 blkno, unsigned int bit); |
| 212 | int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, | 212 | int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, |
| 213 | int type, int slot, u64 blkno, | 213 | int type, int slot, u64 suballoc, u64 blkno, |
| 214 | unsigned int bit); | 214 | unsigned int bit); |
| 215 | static inline int ocfs2_dealloc_has_cluster(struct ocfs2_cached_dealloc_ctxt *c) | 215 | static inline int ocfs2_dealloc_has_cluster(struct ocfs2_cached_dealloc_ctxt *c) |
| 216 | { | 216 | { |