Skip to content

Commit 677b367

Browse files
chrboeaxboe
chrboe
authored and
axboe
committed
drbd: add context parameter to expect() macro
Originally-from: Andreas Gruenbacher <agruen@linbit.com> Signed-off-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com> Link: https://lore.kernel.org/r/20221201110349.1282687-6-christoph.boehmwalder@linbit.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent e3fa02d commit 677b367

File tree

6 files changed

+42
-42
lines changed

6 files changed

+42
-42
lines changed

‎drivers/block/drbd/drbd_actlog.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -868,9 +868,9 @@ int __drbd_change_sync(struct drbd_device *device, sector_t sector, int size,
868868
nr_sectors = get_capacity(device->vdisk);
869869
esector = sector + (size >> 9) - 1;
870870

871-
if (!expect(sector < nr_sectors))
871+
if (!expect(device, sector < nr_sectors))
872872
goto out;
873-
if (!expect(esector < nr_sectors))
873+
if (!expect(device, esector < nr_sectors))
874874
esector = nr_sectors - 1;
875875

876876
lbnr = BM_SECT_TO_BIT(nr_sectors-1);

‎drivers/block/drbd/drbd_bitmap.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ int drbd_bm_init(struct drbd_device *device)
448448

449449
sector_t drbd_bm_capacity(struct drbd_device *device)
450450
{
451-
if (!expect(device->bitmap))
451+
if (!expect(device, device->bitmap))
452452
return 0;
453453
return device->bitmap->bm_dev_capacity;
454454
}
@@ -457,7 +457,7 @@ sector_t drbd_bm_capacity(struct drbd_device *device)
457457
*/
458458
void drbd_bm_cleanup(struct drbd_device *device)
459459
{
460-
if (!expect(device->bitmap))
460+
if (!expect(device, device->bitmap))
461461
return;
462462
bm_free_pages(device->bitmap->bm_pages, device->bitmap->bm_number_of_pages);
463463
bm_vk_free(device->bitmap->bm_pages);
@@ -636,7 +636,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi
636636
int err = 0;
637637
bool growing;
638638

639-
if (!expect(b))
639+
if (!expect(device, b))
640640
return -ENOMEM;
641641

642642
drbd_bm_lock(device, "resize", BM_LOCKED_MASK);
@@ -757,9 +757,9 @@ unsigned long _drbd_bm_total_weight(struct drbd_device *device)
757757
unsigned long s;
758758
unsigned long flags;
759759

760-
if (!expect(b))
760+
if (!expect(device, b))
761761
return 0;
762-
if (!expect(b->bm_pages))
762+
if (!expect(device, b->bm_pages))
763763
return 0;
764764

765765
spin_lock_irqsave(&b->bm_lock, flags);
@@ -783,9 +783,9 @@ unsigned long drbd_bm_total_weight(struct drbd_device *device)
783783
size_t drbd_bm_words(struct drbd_device *device)
784784
{
785785
struct drbd_bitmap *b = device->bitmap;
786-
if (!expect(b))
786+
if (!expect(device, b))
787787
return 0;
788-
if (!expect(b->bm_pages))
788+
if (!expect(device, b->bm_pages))
789789
return 0;
790790

791791
return b->bm_words;
@@ -794,7 +794,7 @@ size_t drbd_bm_words(struct drbd_device *device)
794794
unsigned long drbd_bm_bits(struct drbd_device *device)
795795
{
796796
struct drbd_bitmap *b = device->bitmap;
797-
if (!expect(b))
797+
if (!expect(device, b))
798798
return 0;
799799

800800
return b->bm_bits;
@@ -816,9 +816,9 @@ void drbd_bm_merge_lel(struct drbd_device *device, size_t offset, size_t number,
816816

817817
end = offset + number;
818818

819-
if (!expect(b))
819+
if (!expect(device, b))
820820
return;
821-
if (!expect(b->bm_pages))
821+
if (!expect(device, b->bm_pages))
822822
return;
823823
if (number == 0)
824824
return;
@@ -863,9 +863,9 @@ void drbd_bm_get_lel(struct drbd_device *device, size_t offset, size_t number,
863863

864864
end = offset + number;
865865

866-
if (!expect(b))
866+
if (!expect(device, b))
867867
return;
868-
if (!expect(b->bm_pages))
868+
if (!expect(device, b->bm_pages))
869869
return;
870870

871871
spin_lock_irq(&b->bm_lock);
@@ -894,9 +894,9 @@ void drbd_bm_get_lel(struct drbd_device *device, size_t offset, size_t number,
894894
void drbd_bm_set_all(struct drbd_device *device)
895895
{
896896
struct drbd_bitmap *b = device->bitmap;
897-
if (!expect(b))
897+
if (!expect(device, b))
898898
return;
899-
if (!expect(b->bm_pages))
899+
if (!expect(device, b->bm_pages))
900900
return;
901901

902902
spin_lock_irq(&b->bm_lock);
@@ -910,9 +910,9 @@ void drbd_bm_set_all(struct drbd_device *device)
910910
void drbd_bm_clear_all(struct drbd_device *device)
911911
{
912912
struct drbd_bitmap *b = device->bitmap;
913-
if (!expect(b))
913+
if (!expect(device, b))
914914
return;
915-
if (!expect(b->bm_pages))
915+
if (!expect(device, b->bm_pages))
916916
return;
917917

918918
spin_lock_irq(&b->bm_lock);
@@ -1332,9 +1332,9 @@ static unsigned long bm_find_next(struct drbd_device *device,
13321332
struct drbd_bitmap *b = device->bitmap;
13331333
unsigned long i = DRBD_END_OF_BITMAP;
13341334

1335-
if (!expect(b))
1335+
if (!expect(device, b))
13361336
return i;
1337-
if (!expect(b->bm_pages))
1337+
if (!expect(device, b->bm_pages))
13381338
return i;
13391339

13401340
spin_lock_irq(&b->bm_lock);
@@ -1436,9 +1436,9 @@ static int bm_change_bits_to(struct drbd_device *device, const unsigned long s,
14361436
struct drbd_bitmap *b = device->bitmap;
14371437
int c = 0;
14381438

1439-
if (!expect(b))
1439+
if (!expect(device, b))
14401440
return 1;
1441-
if (!expect(b->bm_pages))
1441+
if (!expect(device, b->bm_pages))
14421442
return 0;
14431443

14441444
spin_lock_irqsave(&b->bm_lock, flags);
@@ -1582,9 +1582,9 @@ int drbd_bm_test_bit(struct drbd_device *device, const unsigned long bitnr)
15821582
unsigned long *p_addr;
15831583
int i;
15841584

1585-
if (!expect(b))
1585+
if (!expect(device, b))
15861586
return 0;
1587-
if (!expect(b->bm_pages))
1587+
if (!expect(device, b->bm_pages))
15881588
return 0;
15891589

15901590
spin_lock_irqsave(&b->bm_lock, flags);
@@ -1619,9 +1619,9 @@ int drbd_bm_count_bits(struct drbd_device *device, const unsigned long s, const
16191619
* robust in case we screwed up elsewhere, in that case pretend there
16201620
* was one dirty bit in the requested area, so we won't try to do a
16211621
* local read there (no bitmap probably implies no disk) */
1622-
if (!expect(b))
1622+
if (!expect(device, b))
16231623
return 1;
1624-
if (!expect(b->bm_pages))
1624+
if (!expect(device, b->bm_pages))
16251625
return 1;
16261626

16271627
spin_lock_irqsave(&b->bm_lock, flags);
@@ -1635,7 +1635,7 @@ int drbd_bm_count_bits(struct drbd_device *device, const unsigned long s, const
16351635
bm_unmap(p_addr);
16361636
p_addr = bm_map_pidx(b, idx);
16371637
}
1638-
if (expect(bitnr < b->bm_bits))
1638+
if (expect(device, bitnr < b->bm_bits))
16391639
c += (0 != test_bit_le(bitnr - (page_nr << (PAGE_SHIFT+3)), p_addr));
16401640
else
16411641
drbd_err(device, "bitnr=%lu bm_bits=%lu\n", bitnr, b->bm_bits);
@@ -1668,9 +1668,9 @@ int drbd_bm_e_weight(struct drbd_device *device, unsigned long enr)
16681668
unsigned long flags;
16691669
unsigned long *p_addr, *bm;
16701670

1671-
if (!expect(b))
1671+
if (!expect(device, b))
16721672
return 0;
1673-
if (!expect(b->bm_pages))
1673+
if (!expect(device, b->bm_pages))
16741674
return 0;
16751675

16761676
spin_lock_irqsave(&b->bm_lock, flags);

‎drivers/block/drbd/drbd_main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ static int _drbd_send_bitmap(struct drbd_device *device)
12591259
struct bm_xfer_ctx c;
12601260
int err;
12611261

1262-
if (!expect(device->bitmap))
1262+
if (!expect(device, device->bitmap))
12631263
return false;
12641264

12651265
if (get_ldev(device)) {
@@ -2250,9 +2250,9 @@ static void do_retry(struct work_struct *ws)
22502250
bool expected;
22512251

22522252
expected =
2253-
expect(atomic_read(&req->completion_ref) == 0) &&
2254-
expect(req->rq_state & RQ_POSTPONED) &&
2255-
expect((req->rq_state & RQ_LOCAL_PENDING) == 0 ||
2253+
expect(device, atomic_read(&req->completion_ref) == 0) &&
2254+
expect(device, req->rq_state & RQ_POSTPONED) &&
2255+
expect(device, (req->rq_state & RQ_LOCAL_PENDING) == 0 ||
22562256
(req->rq_state & RQ_LOCAL_ABORTED) != 0);
22572257

22582258
if (!expected)

‎drivers/block/drbd/drbd_nl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,7 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)
15431543
goto fail_unlock;
15441544
}
15451545

1546-
if (!expect(new_disk_conf->resync_rate >= 1))
1546+
if (!expect(device, new_disk_conf->resync_rate >= 1))
15471547
new_disk_conf->resync_rate = 1;
15481548

15491549
sanitize_disk_conf(device, new_disk_conf, device->ldev);

‎drivers/block/drbd/drbd_polymorph_printk.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ void drbd_dyn_dbg_with_wrong_object_type(void);
130130
*
131131
* Unlike the assert macro, this macro returns a boolean result.
132132
*/
133-
#define expect(exp) ({ \
133+
#define expect(x, exp) ({ \
134134
bool _bool = (exp); \
135135
if (!_bool && drbd_ratelimit()) \
136-
drbd_err(device, "ASSERTION %s FAILED in %s\n", \
136+
drbd_err(x, "ASSERTION %s FAILED in %s\n", \
137137
#exp, __func__); \
138138
_bool; \
139139
})

‎drivers/block/drbd/drbd_receiver.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ void __drbd_free_peer_req(struct drbd_device *device, struct drbd_peer_request *
413413
drbd_free_pages(device, peer_req->pages, is_net);
414414
D_ASSERT(device, atomic_read(&peer_req->pending_bios) == 0);
415415
D_ASSERT(device, drbd_interval_empty(&peer_req->i));
416-
if (!expect(!(peer_req->flags & EE_CALL_AL_COMPLETE_IO))) {
416+
if (!expect(device, !(peer_req->flags & EE_CALL_AL_COMPLETE_IO))) {
417417
peer_req->flags &= ~EE_CALL_AL_COMPLETE_IO;
418418
drbd_al_complete_io(device, &peer_req->i);
419419
}
@@ -1873,21 +1873,21 @@ read_in_block(struct drbd_peer_device *peer_device, u64 id, sector_t sector,
18731873
/* assume request_size == data_size, but special case trim. */
18741874
ds = data_size;
18751875
if (trim) {
1876-
if (!expect(data_size == 0))
1876+
if (!expect(peer_device, data_size == 0))
18771877
return NULL;
18781878
ds = be32_to_cpu(trim->size);
18791879
} else if (zeroes) {
1880-
if (!expect(data_size == 0))
1880+
if (!expect(peer_device, data_size == 0))
18811881
return NULL;
18821882
ds = be32_to_cpu(zeroes->size);
18831883
}
18841884

1885-
if (!expect(IS_ALIGNED(ds, 512)))
1885+
if (!expect(peer_device, IS_ALIGNED(ds, 512)))
18861886
return NULL;
18871887
if (trim || zeroes) {
1888-
if (!expect(ds <= (DRBD_MAX_BBIO_SECTORS << 9)))
1888+
if (!expect(peer_device, ds <= (DRBD_MAX_BBIO_SECTORS << 9)))
18891889
return NULL;
1890-
} else if (!expect(ds <= DRBD_MAX_BIO_SIZE))
1890+
} else if (!expect(peer_device, ds <= DRBD_MAX_BIO_SIZE))
18911891
return NULL;
18921892

18931893
/* even though we trust out peer,

0 commit comments

Comments
 (0)