From 27884f4bce63ebb8821992787d3e687cc24d95a3 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Tue, 8 Feb 2022 08:19:45 -0500 Subject: [PATCH] libceph: drop else branches in prepare_read_data{,_cont} Just call set_in_bvec in the non-conditional part. Signed-off-by: Jeff Layton Reviewed-by: Ilya Dryomov Signed-off-by: Ilya Dryomov --- net/ceph/messenger_v2.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c index c81379f93ad5..c6e5bfc717d5 100644 --- a/net/ceph/messenger_v2.c +++ b/net/ceph/messenger_v2.c @@ -1773,10 +1773,8 @@ static int prepare_read_data(struct ceph_connection *con) bv.bv_page = con->bounce_page; bv.bv_offset = 0; - set_in_bvec(con, &bv); - } else { - set_in_bvec(con, &bv); } + set_in_bvec(con, &bv); con->v2.in_state = IN_S_PREPARE_READ_DATA_CONT; return 0; } @@ -1807,10 +1805,8 @@ static void prepare_read_data_cont(struct ceph_connection *con) if (ceph_test_opt(from_msgr(con->msgr), RXBOUNCE)) { bv.bv_page = con->bounce_page; bv.bv_offset = 0; - set_in_bvec(con, &bv); - } else { - set_in_bvec(con, &bv); } + set_in_bvec(con, &bv); WARN_ON(con->v2.in_state != IN_S_PREPARE_READ_DATA_CONT); return; }