openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drbd: don't detour through bd_contains for the gendisk 

bd_disk is set on all block devices, including those for partitions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-09-03 07:41:00 +02:00 committed by Jens Axboe
parent 4245e52d25
commit 8c40c7c483
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/drbd/drbd_receiver.c
View File

@ -2789,7 +2789,7 @@ bool drbd_rs_should_slow_down(struct drbd_device *device, sector_t sector,
bool drbd_rs_c_min_rate_throttle(struct drbd_device *device) bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
{ {
struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk; struct gendisk *disk = device->ldev->backing_bdev->bd_disk;
unsigned long db, dt, dbdt; unsigned long db, dt, dbdt;
unsigned int c_min_rate; unsigned int c_min_rate;
int curr_events; int curr_events;

2
drivers/block/drbd/drbd_worker.c
View File

@ -1672,7 +1672,7 @@ void drbd_resync_after_changed(struct drbd_device *device)
void drbd_rs_controller_reset(struct drbd_device *device) void drbd_rs_controller_reset(struct drbd_device *device)
{ {
struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk; struct gendisk *disk = device->ldev->backing_bdev->bd_disk;
struct fifo_buffer *plan; struct fifo_buffer *plan;
atomic_set(&device->rs_sect_in, 0); atomic_set(&device->rs_sect_in, 0);