diff options
| author | Chris Mason <clm@fb.com> | 2016-01-11 05:59:32 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-11 05:59:32 -0800 |
| commit | a3058101c17d2825f34a0ab5c37d93ead0f4d9dc (patch) | |
| tree | 193417b02c4fa79b582b435e154761b91a501884 /fs/btrfs/ctree.h | |
| parent | 511711af91f21d80b27f18b569352d6896562828 (diff) | |
| parent | ee592d07716139ef7c3ea8049936cbc3aafbc533 (diff) | |
| download | op-kernel-dev-a3058101c17d2825f34a0ab5c37d93ead0f4d9dc.zip op-kernel-dev-a3058101c17d2825f34a0ab5c37d93ead0f4d9dc.tar.gz | |
Merge branch 'misc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 9a88d0c..70c9405 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -177,7 +177,7 @@ struct btrfs_ordered_sum; /* csum types */ #define BTRFS_CSUM_TYPE_CRC32 0 -static int btrfs_csum_sizes[] = { 4 }; +static const int btrfs_csum_sizes[] = { 4 }; /* four bytes for CRC32 */ #define BTRFS_EMPTY_DIR_SIZE 0 @@ -598,14 +598,15 @@ struct btrfs_node { * The slots array records the index of the item or block pointer * used while walking the tree. */ +enum { READA_NONE = 0, READA_BACK, READA_FORWARD }; struct btrfs_path { struct extent_buffer *nodes[BTRFS_MAX_LEVEL]; int slots[BTRFS_MAX_LEVEL]; /* if there is real range locking, this locks field will change */ - int locks[BTRFS_MAX_LEVEL]; - int reada; + u8 locks[BTRFS_MAX_LEVEL]; + u8 reada; /* keep some upper locks as we walk down */ - int lowest_level; + u8 lowest_level; /* * set by btrfs_split_item, tells search_slot to keep all locks |
