diff options
| author | Kalle Valo <kvalo@kernel.org> | 2023-01-17 13:36:25 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2023-01-17 13:36:25 +0200 |
| commit | d0e99511834b6828c960e978d9a8cb6e5731250d (patch) | |
| tree | e7b062c1f9d28a55083477a1462286a7923a57fd /fs/btrfs/delalloc-space.h | |
| parent | de7d0ff301fccc75281d7d8eb98c4a47faacf32d (diff) | |
| parent | 80f8a66dede0a4b4e9e846765a97809c6fe49ce5 (diff) | |
| download | linux-d0e99511834b6828c960e978d9a8cb6e5731250d.tar.gz linux-d0e99511834b6828c960e978d9a8cb6e5731250d.tar.bz2 linux-d0e99511834b6828c960e978d9a8cb6e5731250d.zip | |
Merge wireless into wireless-next
Due to the two cherry picked commits from wireless to wireless-next we have
several conflicts in mt76. To avoid any bugs with conflicts merge wireless into
wireless-next.
96f134dc1964 wifi: mt76: handle possible mt76_rx_token_consume failures
fe13dad8992b wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails
Diffstat (limited to 'fs/btrfs/delalloc-space.h')
| -rw-r--r-- | fs/btrfs/delalloc-space.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/delalloc-space.h b/fs/btrfs/delalloc-space.h index e07d46043455..c5d573f2366e 100644 --- a/fs/btrfs/delalloc-space.h +++ b/fs/btrfs/delalloc-space.h @@ -20,5 +20,8 @@ void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes, bool qgroup_free); int btrfs_delalloc_reserve_space(struct btrfs_inode *inode, struct extent_changeset **reserved, u64 start, u64 len); +int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes, + u64 disk_num_bytes, bool noflush); +void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes); #endif /* BTRFS_DELALLOC_SPACE_H */ |