diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:10:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:10:41 -0700 |
| commit | 49302baa640d90074d26297156d180320a7aed2f (patch) | |
| tree | 5f8bc3cb178b0de73cfec12643078739afecf1e4 /fs/gfs2/rgrp.h | |
| parent | eadc3875ebb724bc749bf604c92c6577d06158d1 (diff) | |
| parent | 46fcb2ed29ff7a9ec34c4ae67b631743eb7e756f (diff) | |
| download | linux-3.10-49302baa640d90074d26297156d180320a7aed2f.tar.gz linux-3.10-49302baa640d90074d26297156d180320a7aed2f.tar.bz2 linux-3.10-49302baa640d90074d26297156d180320a7aed2f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: combine duplicated block freeing routines
GFS2: Add S_NOSEC support
GFS2: Automatically adjust glock min hold time
GFS2: Cache dir hash table in a contiguous buffer
Diffstat (limited to 'fs/gfs2/rgrp.h')
| -rw-r--r-- | fs/gfs2/rgrp.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h index a80e3034ac4..d253f9a8c70 100644 --- a/fs/gfs2/rgrp.h +++ b/fs/gfs2/rgrp.h @@ -52,9 +52,7 @@ extern int gfs2_ri_update(struct gfs2_inode *ip); extern int gfs2_alloc_block(struct gfs2_inode *ip, u64 *bn, unsigned int *n); extern int gfs2_alloc_di(struct gfs2_inode *ip, u64 *bn, u64 *generation); -extern void __gfs2_free_data(struct gfs2_inode *ip, u64 bstart, u32 blen); -extern void gfs2_free_data(struct gfs2_inode *ip, u64 bstart, u32 blen); -extern void __gfs2_free_meta(struct gfs2_inode *ip, u64 bstart, u32 blen); +extern void __gfs2_free_blocks(struct gfs2_inode *ip, u64 bstart, u32 blen, int meta); extern void gfs2_free_meta(struct gfs2_inode *ip, u64 bstart, u32 blen); extern void gfs2_free_di(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip); extern void gfs2_unlink_di(struct inode *inode); |