diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
| commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
| tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /fs/ocfs2/suballoc.h | |
| parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
| parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ocfs2/suballoc.h')
| -rw-r--r-- | fs/ocfs2/suballoc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h index 8799033bb459..544c600662bd 100644 --- a/fs/ocfs2/suballoc.h +++ b/fs/ocfs2/suballoc.h | |||
| @@ -36,6 +36,7 @@ typedef int (group_search_t)(struct inode *, | |||
| 36 | struct ocfs2_alloc_context { | 36 | struct ocfs2_alloc_context { |
| 37 | struct inode *ac_inode; /* which bitmap are we allocating from? */ | 37 | struct inode *ac_inode; /* which bitmap are we allocating from? */ |
| 38 | struct buffer_head *ac_bh; /* file entry bh */ | 38 | struct buffer_head *ac_bh; /* file entry bh */ |
| 39 | u32 ac_alloc_slot; /* which slot are we allocating from? */ | ||
| 39 | u32 ac_bits_wanted; | 40 | u32 ac_bits_wanted; |
| 40 | u32 ac_bits_given; | 41 | u32 ac_bits_given; |
| 41 | #define OCFS2_AC_USE_LOCAL 1 | 42 | #define OCFS2_AC_USE_LOCAL 1 |