diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2012-03-27 16:09:17 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2012-03-27 16:09:17 +0200 |
| commit | 0c460c0d70e10463e44bdf1d406e9c5ec03b1af6 (patch) | |
| tree | 8c28962481b64a3dcabb2294094435832a23516d /fs/btrfs/ctree.h | |
| parent | Btrfs: make profile_is_valid() check more strict (diff) | |
| download | linux-0c460c0d70e10463e44bdf1d406e9c5ec03b1af6.tar.xz linux-0c460c0d70e10463e44bdf1d406e9c5ec03b1af6.zip | |
Btrfs: move alloc_profile_is_valid() to volumes.c
Header file is not a good place to define functions. This also moves a
call to alloc_profile_is_valid() down the stack and removes a redundant
check from __btrfs_alloc_chunk() - alloc_profile_is_valid() takes it
into account.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index f057e92df39f..a56e1e00105f 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2734,29 +2734,6 @@ static inline void free_fs_info(struct btrfs_fs_info *fs_info) kfree(fs_info->super_for_commit); kfree(fs_info); } -/** - * alloc_profile_is_valid - see if a given profile is valid and reduced - * @flags: profile to validate - * @extended: if true @flags is treated as an extended profile - */ -static inline int alloc_profile_is_valid(u64 flags, int extended) -{ - u64 mask = (extended ? BTRFS_EXTENDED_PROFILE_MASK : - BTRFS_BLOCK_GROUP_PROFILE_MASK); - - flags &= ~BTRFS_BLOCK_GROUP_TYPE_MASK; - - /* 1) check that all other bits are zeroed */ - if (flags & ~mask) - return 0; - - /* 2) see if profile is reduced */ - if (flags == 0) - return !extended; /* "0" is valid for usual profiles */ - - /* true if exactly one bit set */ - return (flags & (flags - 1)) == 0; -} /* root-item.c */ int btrfs_find_root_ref(struct btrfs_root *tree_root, |