diff options
| author | Joel Becker <joel.becker@oracle.com> | 2008-11-13 14:49:13 -0800 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-01-05 08:36:53 -0800 |
| commit | 57e3e7971136003c96766346049aa73b82cab079 (patch) | |
| tree | 4ba192d7507c77bc1bebd20ba6d82fbbe3da5428 /fs/ocfs2/suballoc.h | |
| parent | 10995aa2451afa20b721cc7de856cae1a13dba57 (diff) | |
| download | kernel_samsung_aries-57e3e7971136003c96766346049aa73b82cab079.zip kernel_samsung_aries-57e3e7971136003c96766346049aa73b82cab079.tar.gz kernel_samsung_aries-57e3e7971136003c96766346049aa73b82cab079.tar.bz2 | |
ocfs2: Consolidate validation of group descriptors.
Currently the validation of group descriptors is directly duplicated so
that one version can error the filesystem and the other (resize) can
just report the problem. Consolidate to one function that takes a
boolean. Wrap that function with the old call for the old users.
This is in preparation for lifting the read+validate step into a
single function.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/suballoc.h')
| -rw-r--r-- | fs/ocfs2/suballoc.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h index 4df159d..7adfcc4 100644 --- a/fs/ocfs2/suballoc.h +++ b/fs/ocfs2/suballoc.h @@ -165,9 +165,23 @@ void ocfs2_free_ac_resource(struct ocfs2_alloc_context *ac); u64 ocfs2_which_cluster_group(struct inode *inode, u32 cluster); /* somewhat more expensive than our other checks, so use sparingly. */ -int ocfs2_check_group_descriptor(struct super_block *sb, - struct ocfs2_dinode *di, - struct ocfs2_group_desc *gd); +/* + * By default, ocfs2_validate_group_descriptor() calls ocfs2_error() when it + * finds a problem. A caller that wants to check a group descriptor + * without going readonly passes a nonzero clean_error. This is only + * resize, really. + */ +int ocfs2_validate_group_descriptor(struct super_block *sb, + struct ocfs2_dinode *di, + struct ocfs2_group_desc *gd, + int clean_error); +static inline int ocfs2_check_group_descriptor(struct super_block *sb, + struct ocfs2_dinode *di, + struct ocfs2_group_desc *gd) +{ + return ocfs2_validate_group_descriptor(sb, di, gd, 0); +} + int ocfs2_lock_allocators(struct inode *inode, struct ocfs2_extent_tree *et, u32 clusters_to_add, u32 extents_to_split, struct ocfs2_alloc_context **data_ac, |