diff options
| author | Chris Mason <clm@fb.com> | 2016-01-11 14:59:32 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-11 14:59:32 +0100 |
| commit | a3058101c17d2825f34a0ab5c37d93ead0f4d9dc (patch) | |
| tree | 193417b02c4fa79b582b435e154761b91a501884 /fs/btrfs/inode-map.c | |
| parent | btrfs: don't run delayed references while we are creating the free space tree (diff) | |
| parent | Btrfs: Check metadata redundancy on balance (diff) | |
| download | linux-a3058101c17d2825f34a0ab5c37d93ead0f4d9dc.tar.xz linux-a3058101c17d2825f34a0ab5c37d93ead0f4d9dc.zip | |
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/inode-map.c')
| -rw-r--r-- | fs/btrfs/inode-map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c index 767a6056ac45..1951ad69382f 100644 --- a/fs/btrfs/inode-map.c +++ b/fs/btrfs/inode-map.c @@ -48,7 +48,7 @@ static int caching_kthread(void *data) /* Since the commit root is read-only, we can safely skip locking. */ path->skip_locking = 1; path->search_commit_root = 1; - path->reada = 2; + path->reada = READA_FORWARD; key.objectid = BTRFS_FIRST_FREE_OBJECTID; key.offset = 0; @@ -334,7 +334,7 @@ static bool use_bitmap(struct btrfs_free_space_ctl *ctl, return true; } -static struct btrfs_free_space_op free_ino_op = { +static const struct btrfs_free_space_op free_ino_op = { .recalc_thresholds = recalculate_thresholds, .use_bitmap = use_bitmap, }; @@ -356,7 +356,7 @@ static bool pinned_use_bitmap(struct btrfs_free_space_ctl *ctl, return false; } -static struct btrfs_free_space_op pinned_free_ino_op = { +static const struct btrfs_free_space_op pinned_free_ino_op = { .recalc_thresholds = pinned_recalc_thresholds, .use_bitmap = pinned_use_bitmap, }; |