···522522 if (be32_to_cpu(rm->m_inc.i_hdr.h_len) == 0)523523 i = 1;524524 else525525- i = ceil(be32_to_cpu(rm->m_inc.i_hdr.h_len), RDS_FRAG_SIZE);525525+ i = DIV_ROUND_UP(be32_to_cpu(rm->m_inc.i_hdr.h_len), RDS_FRAG_SIZE);526526527527 work_alloc = rds_ib_ring_alloc(&ic->i_send_ring, i, &pos);528528 if (work_alloc == 0) {···879879 * Instead of knowing how to return a partial rdma read/write we insist that there880880 * be enough work requests to send the entire message.881881 */882882- i = ceil(op->op_count, max_sge);882882+ i = DIV_ROUND_UP(op->op_count, max_sge);883883884884 work_alloc = rds_ib_ring_alloc(&ic->i_send_ring, i, &pos);885885 if (work_alloc != i) {
+2-2
net/rds/message.c
···341341{342342 struct rds_message *rm;343343 unsigned int i;344344- int num_sgs = ceil(total_len, PAGE_SIZE);344344+ int num_sgs = DIV_ROUND_UP(total_len, PAGE_SIZE);345345 int extra_bytes = num_sgs * sizeof(struct scatterlist);346346 int ret;347347···351351352352 set_bit(RDS_MSG_PAGEVEC, &rm->m_flags);353353 rm->m_inc.i_hdr.h_len = cpu_to_be32(total_len);354354- rm->data.op_nents = ceil(total_len, PAGE_SIZE);354354+ rm->data.op_nents = DIV_ROUND_UP(total_len, PAGE_SIZE);355355 rm->data.op_sg = rds_message_alloc_sgs(rm, num_sgs, &ret);356356 if (!rm->data.op_sg) {357357 rds_message_put(rm);
-4
net/rds/rds.h
···4848}4949#endif50505151-/* XXX is there one of these somewhere? */5252-#define ceil(x, y) \5353- ({ unsigned long __x = (x), __y = (y); (__x + __y - 1) / __y; })5454-5551#define RDS_FRAG_SHIFT 125652#define RDS_FRAG_SIZE ((unsigned int)(1 << RDS_FRAG_SHIFT))5753
+1-1
net/rds/send.c
···11071107 size_t total_payload_len = payload_len, rdma_payload_len = 0;11081108 bool zcopy = ((msg->msg_flags & MSG_ZEROCOPY) &&11091109 sock_flag(rds_rs_to_sk(rs), SOCK_ZEROCOPY));11101110- int num_sgs = ceil(payload_len, PAGE_SIZE);11101110+ int num_sgs = DIV_ROUND_UP(payload_len, PAGE_SIZE);11111111 int namelen;11121112 struct rds_iov_vector_arr vct;11131113 int ind;