From patchwork Wed Feb 10 11:24:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 8270381 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 12492BEEE5 for ; Wed, 10 Feb 2016 11:24:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4130220373 for ; Wed, 10 Feb 2016 11:24:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59E2C202D1 for ; Wed, 10 Feb 2016 11:24:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753631AbcBJLYt (ORCPT ); Wed, 10 Feb 2016 06:24:49 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35279 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754491AbcBJLYm (ORCPT ); Wed, 10 Feb 2016 06:24:42 -0500 Received: by mail-wm0-f68.google.com with SMTP id g62so3532377wme.2 for ; Wed, 10 Feb 2016 03:24:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G+yoVhVuaTVFC9lxyvk9LelJMz+ISjg2LI/qOqgU+KI=; b=hpDZvOfQuvIe6+f0LtdWterPzrRt35skc8Qsur+I+VZrbWa62EXcC0OacUNC0eGMOt yJu/IV5k8TXrnciBoGU+CmIirQURqGPzK4zGfGpuUSnf17mdjSW23yueRrfWDoXeRfg9 z5pREOwQTxupbdgD7Igfa+uiW4PXbnS4Z/V+yYWyQnnjlqmrApPQXLouKjNFqIyNHymT 0kF6Bo232XqKuOj5uqc3R3wFCFmFukaqM+GJ9aouMii2oYql06OguanY8Y0cU2PbDzPO HZo9hjWU7yoStknnJHL5RpFTfDcXuax+pa6jJ5i5vwYdmbUpGQUEe6Q8RCWLeO41vQVn +74A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G+yoVhVuaTVFC9lxyvk9LelJMz+ISjg2LI/qOqgU+KI=; b=JB8CrqVJ7bshvTy9MHRYaBPwXxbbfWxCDnuj2kFgr/imY0ehTgayt7af486exLMhC5 gmHNm2epVLYiZtFcF54efDvv/FgooyevYHeThTDkKsx4boXebkleJdqIJJGMD+NFM0oL pj3FVJfrIDdm4+VnwlxIMvjLz55TKSoxvbCffi+tfiHfQaB26h+pmeII1307ESeKF8qC jnpNmh/gQhP5AvSlLvZYOTP0NH2iD/VyRl/OdOBj5HTfKT5lGKjcw4vAoWa/phikCess lZRu1KreODDaHMVRgQ6VetLtYCQVVSNHCpZ9ZU6gZ+VoP83G+tvyMSXo6sJyUcKiGmHG 0dOQ== X-Gm-Message-State: AG10YOTOo0sCTNeBQ0YvGxvvqzBpDxWSV7bZItXB7o6L8PTBAsRXBEf3KMf25K6+qZe4UA== X-Received: by 10.28.87.21 with SMTP id l21mr10095664wmb.8.1455103481928; Wed, 10 Feb 2016 03:24:41 -0800 (PST) Received: from localhost.localdomain.com (ip-78-102-114-179.net.upcbroadband.cz. [78.102.114.179]) by smtp.gmail.com with ESMTPSA id l2sm2524819wjf.15.2016.02.10.03.24.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2016 03:24:41 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Zheng Yan Subject: [PATCH 3/4] libceph: osdc->req_mempool should be backed by a slab pool Date: Wed, 10 Feb 2016 12:24:06 +0100 Message-Id: <1455103447-23559-4-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1455103447-23559-1-git-send-email-idryomov@gmail.com> References: <1455103447-23559-1-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ceph_osd_request_cache was introduced a long time ago. Also, osd_req is about to get a flexible array member, which ceph_osd_request_cache is going to be aware of. Signed-off-by: Ilya Dryomov --- net/ceph/osd_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index d92fd4ad5a66..8bf4f74064e5 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2637,8 +2637,8 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) round_jiffies_relative(osdc->client->options->osd_idle_ttl)); err = -ENOMEM; - osdc->req_mempool = mempool_create_kmalloc_pool(10, - sizeof(struct ceph_osd_request)); + osdc->req_mempool = mempool_create_slab_pool(10, + ceph_osd_request_cache); if (!osdc->req_mempool) goto out;