diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-03-24 19:53:54 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-03-24 20:10:20 +0300 |
| commit | dc0a7b52007145a85d0c2f3151870b101568b449 (patch) | |
| tree | ef53a994e39d47748b0a52a153a2207809881fec /fs/btrfs/space-info.h | |
| parent | 323fe43cf9aef79159ba8937218a3f076bf505af (diff) | |
| parent | 608f1b136616ff09d717776922c9ea9e9f9f3947 (diff) | |
| download | linux-dc0a7b52007145a85d0c2f3151870b101568b449.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
6e9d51b1a5cb ("net/mlx5e: Initialize link speed to zero")
1bffcea42926 ("net/mlx5e: Add devlink hairpin queues parameters")
https://lore.kernel.org/all/20230324120623.4ebbc66f@canb.auug.org.au/
https://lore.kernel.org/all/20230321211135.47711-1-saeed@kernel.org/
Adjacent changes:
drivers/net/phy/phy.c
323fe43cf9ae ("net: phy: Improved PHY error reporting in state machine")
4203d84032e2 ("net: phy: Ensure state transitions are processed from phy_stop()")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/btrfs/space-info.h')
| -rw-r--r-- | fs/btrfs/space-info.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h index fc99ea2b0c34..2033b71b18ce 100644 --- a/fs/btrfs/space-info.h +++ b/fs/btrfs/space-info.h @@ -96,8 +96,6 @@ struct btrfs_space_info { u64 bytes_may_use; /* number of bytes that may be used for delalloc/allocations */ u64 bytes_readonly; /* total bytes that are read only */ - /* Total bytes in the space, but only accounts active block groups. */ - u64 active_total_bytes; u64 bytes_zone_unusable; /* total bytes that are unusable until resetting the device zone */ |