diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2011-02-24 05:35:43 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-10-14 10:47:50 -0400 |
commit | 8ccf218e9f19ecae4d115eeff686c9f1a1e5bc9e (patch) | |
tree | f7946fd74796075b582bc79eacf956158d85a443 /drivers | |
parent | 206d3589411fbdead67a358ce9aaa20d771724df (diff) |
drbd: Replace atomic_add_return with atomic_inc_return
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 4 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index efedfbc06198..4718aa4e5272 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -1242,7 +1242,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd, | |||
1242 | p.sector = sector; | 1242 | p.sector = sector; |
1243 | p.block_id = block_id; | 1243 | p.block_id = block_id; |
1244 | p.blksize = blksize; | 1244 | p.blksize = blksize; |
1245 | p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq)); | 1245 | p.seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq)); |
1246 | 1246 | ||
1247 | if (!mdev->tconn->meta.socket || mdev->state.conn < C_CONNECTED) | 1247 | if (!mdev->tconn->meta.socket || mdev->state.conn < C_CONNECTED) |
1248 | return false; | 1248 | return false; |
@@ -1530,7 +1530,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) | |||
1530 | prepare_header(mdev, &p.head, P_DATA, sizeof(p) - sizeof(struct p_header) + dgs + req->i.size); | 1530 | prepare_header(mdev, &p.head, P_DATA, sizeof(p) - sizeof(struct p_header) + dgs + req->i.size); |
1531 | p.sector = cpu_to_be64(req->i.sector); | 1531 | p.sector = cpu_to_be64(req->i.sector); |
1532 | p.block_id = (unsigned long)req; | 1532 | p.block_id = (unsigned long)req; |
1533 | p.seq_num = cpu_to_be32(req->seq_num = atomic_add_return(1, &mdev->packet_seq)); | 1533 | p.seq_num = cpu_to_be32(req->seq_num = atomic_inc_return(&mdev->packet_seq)); |
1534 | 1534 | ||
1535 | dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw); | 1535 | dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw); |
1536 | 1536 | ||
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 90d731723205..016858741cfd 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -2374,7 +2374,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state) | |||
2374 | cn_reply->id.idx = CN_IDX_DRBD; | 2374 | cn_reply->id.idx = CN_IDX_DRBD; |
2375 | cn_reply->id.val = CN_VAL_DRBD; | 2375 | cn_reply->id.val = CN_VAL_DRBD; |
2376 | 2376 | ||
2377 | cn_reply->seq = atomic_add_return(1, &drbd_nl_seq); | 2377 | cn_reply->seq = atomic_inc_return(&drbd_nl_seq); |
2378 | cn_reply->ack = 0; /* not used here. */ | 2378 | cn_reply->ack = 0; /* not used here. */ |
2379 | cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + | 2379 | cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + |
2380 | (int)((char *)tl - (char *)reply->tag_list); | 2380 | (int)((char *)tl - (char *)reply->tag_list); |
@@ -2406,7 +2406,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name) | |||
2406 | cn_reply->id.idx = CN_IDX_DRBD; | 2406 | cn_reply->id.idx = CN_IDX_DRBD; |
2407 | cn_reply->id.val = CN_VAL_DRBD; | 2407 | cn_reply->id.val = CN_VAL_DRBD; |
2408 | 2408 | ||
2409 | cn_reply->seq = atomic_add_return(1, &drbd_nl_seq); | 2409 | cn_reply->seq = atomic_inc_return(&drbd_nl_seq); |
2410 | cn_reply->ack = 0; /* not used here. */ | 2410 | cn_reply->ack = 0; /* not used here. */ |
2411 | cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + | 2411 | cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + |
2412 | (int)((char *)tl - (char *)reply->tag_list); | 2412 | (int)((char *)tl - (char *)reply->tag_list); |
@@ -2485,7 +2485,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev, const char *reason, const int dgs, | |||
2485 | cn_reply->id.idx = CN_IDX_DRBD; | 2485 | cn_reply->id.idx = CN_IDX_DRBD; |
2486 | cn_reply->id.val = CN_VAL_DRBD; | 2486 | cn_reply->id.val = CN_VAL_DRBD; |
2487 | 2487 | ||
2488 | cn_reply->seq = atomic_add_return(1,&drbd_nl_seq); | 2488 | cn_reply->seq = atomic_inc_return(&drbd_nl_seq); |
2489 | cn_reply->ack = 0; // not used here. | 2489 | cn_reply->ack = 0; // not used here. |
2490 | cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + | 2490 | cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + |
2491 | (int)((char*)tl - (char*)reply->tag_list); | 2491 | (int)((char*)tl - (char*)reply->tag_list); |
@@ -2524,7 +2524,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev) | |||
2524 | cn_reply->id.idx = CN_IDX_DRBD; | 2524 | cn_reply->id.idx = CN_IDX_DRBD; |
2525 | cn_reply->id.val = CN_VAL_DRBD; | 2525 | cn_reply->id.val = CN_VAL_DRBD; |
2526 | 2526 | ||
2527 | cn_reply->seq = atomic_add_return(1, &drbd_nl_seq); | 2527 | cn_reply->seq = atomic_inc_return(&drbd_nl_seq); |
2528 | cn_reply->ack = 0; /* not used here. */ | 2528 | cn_reply->ack = 0; /* not used here. */ |
2529 | cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + | 2529 | cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + |
2530 | (int)((char *)tl - (char *)reply->tag_list); | 2530 | (int)((char *)tl - (char *)reply->tag_list); |