diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2017-05-17 11:38:35 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-19 18:25:59 +0200 |
| commit | 1b86826d12dc4acf9576cad9c43da74025dc8074 (patch) | |
| tree | f641fee8f721be73f3808c796e93e983d132ff9e /fs/btrfs/inode.c | |
| parent | e03733da5aa68fa2ae3f8d1ab12a570c823a647f (diff) | |
| download | lwn-1b86826d12dc4acf9576cad9c43da74025dc8074.tar.gz lwn-1b86826d12dc4acf9576cad9c43da74025dc8074.zip | |
btrfs: cleanup root usage by btrfs_get_alloc_profile
There are two places where we don't already know what kind of alloc
profile we need before calling btrfs_get_alloc_profile, but we need
access to a root everywhere we call it.
This patch adds helpers for btrfs_{data,metadata,system}_alloc_profile()
and relegates btrfs_system_alloc_profile to a static for use in those
two cases. The next patch will eliminate one of those.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 683ee05798e5..222d33d78092 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8473,7 +8473,6 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip, { struct inode *inode = dip->inode; struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); - struct btrfs_root *root = BTRFS_I(inode)->root; struct bio *bio; struct bio *orig_bio = dip->orig_bio; u64 start_sector = orig_bio->bi_iter.bi_sector; @@ -8499,7 +8498,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip, } /* async crcs make it difficult to collect full stripe writes. */ - if (btrfs_get_alloc_profile(root, 1) & BTRFS_BLOCK_GROUP_RAID56_MASK) + if (btrfs_data_alloc_profile(fs_info) & BTRFS_BLOCK_GROUP_RAID56_MASK) async_submit = 0; else async_submit = 1; |