diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 15:24:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 15:24:39 +1100 |
| commit | 83548563c157403ba219b5bd9c59141f11377182 (patch) | |
| tree | 778e58f318fb178bfd8d5580f5437368cd7b6f7d /fs/ocfs2/localalloc.h | |
| parent | 7ddcdb2ccdcae0838a39b1bf7b0773c5540da847 (diff) | |
| parent | 7679372dd5f9a7176914398576d802379bb3c634 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
drivers/misc/mei/hbm.c
Diffstat (limited to 'fs/ocfs2/localalloc.h')
| -rw-r--r-- | fs/ocfs2/localalloc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ocfs2/localalloc.h b/fs/ocfs2/localalloc.h index 1be9b5864460..44a7d1fb2dec 100644 --- a/fs/ocfs2/localalloc.h +++ b/fs/ocfs2/localalloc.h @@ -55,6 +55,12 @@ int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb, u32 *bit_off, u32 *num_bits); +int ocfs2_free_local_alloc_bits(struct ocfs2_super *osb, + handle_t *handle, + struct ocfs2_alloc_context *ac, + u32 bit_off, + u32 num_bits); + void ocfs2_local_alloc_seen_free_bits(struct ocfs2_super *osb, unsigned int num_clusters); void ocfs2_la_enable_worker(struct work_struct *work); |