drbd: Replace atomic_add_return with atomic_inc_return
authorAndreas Gruenbacher <agruen@linbit.com>
Thu, 24 Feb 2011 10:35:43 +0000 (11:35 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 14 Oct 2011 14:47:50 +0000 (16:47 +0200)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_nl.c

index efedfbc061987e2642686e05b4016834e7a60450..4718aa4e5272c1ac4e2412b47ee8ef024372c941 100644 (file)
@@ -1242,7 +1242,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
        p.sector   = sector;
        p.block_id = block_id;
        p.blksize  = blksize;
-       p.seq_num  = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
+       p.seq_num  = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
 
        if (!mdev->tconn->meta.socket || mdev->state.conn < C_CONNECTED)
                return false;
@@ -1530,7 +1530,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
        prepare_header(mdev, &p.head, P_DATA, sizeof(p) - sizeof(struct p_header) + dgs + req->i.size);
        p.sector   = cpu_to_be64(req->i.sector);
        p.block_id = (unsigned long)req;
-       p.seq_num  = cpu_to_be32(req->seq_num = atomic_add_return(1, &mdev->packet_seq));
+       p.seq_num  = cpu_to_be32(req->seq_num = atomic_inc_return(&mdev->packet_seq));
 
        dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
 
index 90d7317232051f34ec54c2b429ba73d0ab441d5f..016858741cfd5c1c55d6dfd74f72798f00f6ea01 100644 (file)
@@ -2374,7 +2374,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
        cn_reply->id.idx = CN_IDX_DRBD;
        cn_reply->id.val = CN_VAL_DRBD;
 
-       cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
+       cn_reply->seq = atomic_inc_return(&drbd_nl_seq);
        cn_reply->ack = 0; /* not used here. */
        cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
                (int)((char *)tl - (char *)reply->tag_list);
@@ -2406,7 +2406,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
        cn_reply->id.idx = CN_IDX_DRBD;
        cn_reply->id.val = CN_VAL_DRBD;
 
-       cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
+       cn_reply->seq = atomic_inc_return(&drbd_nl_seq);
        cn_reply->ack = 0; /* not used here. */
        cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
                (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,
        cn_reply->id.idx = CN_IDX_DRBD;
        cn_reply->id.val = CN_VAL_DRBD;
 
-       cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
+       cn_reply->seq = atomic_inc_return(&drbd_nl_seq);
        cn_reply->ack = 0; // not used here.
        cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
                (int)((char*)tl - (char*)reply->tag_list);
@@ -2524,7 +2524,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
        cn_reply->id.idx = CN_IDX_DRBD;
        cn_reply->id.val = CN_VAL_DRBD;
 
-       cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
+       cn_reply->seq = atomic_inc_return(&drbd_nl_seq);
        cn_reply->ack = 0; /* not used here. */
        cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
                (int)((char *)tl - (char *)reply->tag_list);