lkml.org 
[lkml]   [2011]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/54] drbd: drbd_send_ack_{dp,rp}(): Return void: the result is never used
    Date
    From: Andreas Gruenbacher <agruen@linbit.com>

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    ---
    drivers/block/drbd/drbd_int.h | 8 ++++----
    drivers/block/drbd/drbd_main.c | 14 +++++++-------
    2 files changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
    index 8e0f59b..d10505e 100644
    --- a/drivers/block/drbd/drbd_int.h
    +++ b/drivers/block/drbd/drbd_int.h
    @@ -1185,10 +1185,10 @@ extern void drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr,
    u32 set_size);
    extern int drbd_send_ack(struct drbd_conf *, enum drbd_packet,
    struct drbd_peer_request *);
    -extern int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packet cmd,
    - struct p_block_req *rp);
    -extern int drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packet cmd,
    - struct p_data *dp, int data_size);
    +extern void drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packet cmd,
    + struct p_block_req *rp);
    +extern void drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packet cmd,
    + struct p_data *dp, int data_size);
    extern int drbd_send_ack_ex(struct drbd_conf *mdev, enum drbd_packet cmd,
    sector_t sector, int blksize, u64 block_id);
    extern int drbd_send_oos(struct drbd_conf *mdev, struct drbd_request *req);
    diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
    index 6d40647..a5371fb 100644
    --- a/drivers/block/drbd/drbd_main.c
    +++ b/drivers/block/drbd/drbd_main.c
    @@ -1264,19 +1264,19 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
    /* dp->sector and dp->block_id already/still in network byte order,
    * data_size is payload size according to dp->head,
    * and may need to be corrected for digest size. */
    -int drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packet cmd,
    - struct p_data *dp, int data_size)
    +void drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packet cmd,
    + struct p_data *dp, int data_size)
    {
    data_size -= (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->integrity_r_tfm) ?
    crypto_hash_digestsize(mdev->tconn->integrity_r_tfm) : 0;
    - return !_drbd_send_ack(mdev, cmd, dp->sector, cpu_to_be32(data_size),
    - dp->block_id);
    + _drbd_send_ack(mdev, cmd, dp->sector, cpu_to_be32(data_size),
    + dp->block_id);
    }

    -int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packet cmd,
    - struct p_block_req *rp)
    +void drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packet cmd,
    + struct p_block_req *rp)
    {
    - return !_drbd_send_ack(mdev, cmd, rp->sector, rp->blksize, rp->block_id);
    + _drbd_send_ack(mdev, cmd, rp->sector, rp->blksize, rp->block_id);
    }

    /**
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-09-05 13:53    [W:0.024 / U:64.764 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site