diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-09 12:37:10 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-09 12:37:10 +0300 |
| commit | 9b085d6e889076928d307f05cabf76e35db1e63b (patch) | |
| tree | 89c83eec98ed9bf07d07d8a7b0dea51564ecd61a /drivers/block/null_blk.h | |
| parent | 441494ec2a302830357d0aa59f3b907e319a8b26 (diff) | |
| parent | f8394f232b1eab649ce2df5c5f15b0e528c92091 (diff) | |
| download | linux-9b085d6e889076928d307f05cabf76e35db1e63b.tar.xz | |
Merge 5.10-rc3 into tty-next
We need the TTY/vt/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/block/null_blk.h')
| -rw-r--r-- | drivers/block/null_blk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/null_blk.h b/drivers/block/null_blk.h index cfd00ad40355..c24d9b5ad81a 100644 --- a/drivers/block/null_blk.h +++ b/drivers/block/null_blk.h @@ -47,7 +47,7 @@ struct nullb_device { unsigned int nr_zones_closed; struct blk_zone *zones; sector_t zone_size_sects; - spinlock_t zone_dev_lock; + spinlock_t zone_lock; unsigned long *zone_locks; unsigned long size; /* device size in MB */ |