From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756387AbcILSqD (ORCPT ); Mon, 12 Sep 2016 14:46:03 -0400 Received: from mout.web.de ([212.227.17.11]:54162 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754777AbcILSqB (ORCPT ); Mon, 12 Sep 2016 14:46:01 -0400 Subject: [PATCH 04/47] block-rbd: Refactor two calls for memory allocations in rbd_dev_image_id() To: ceph-devel@vger.kernel.org, Alex Elder , Ilya Dryomov , Sage Weil References: <566ABCD9.1060404@users.sourceforge.net> <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Mon, 12 Sep 2016 20:45:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:pPyfziB+I4iMblWDuOpDA1G7Wrds5mnbnwx+AXDBVgjYu+oVNIv MmMZ0huFRwR8fVsyI6eXvpoo7h+bd7tsjcPs4a+G0csSmhyBKsV13Rn2IRS0t9ajYb8K/KM rPhWD2KyeCKyIboj9tMvmwBbtY6O1PHRLmpi4Rty6vPeGR9N/CAHpBYwCH6DpYjvjr0IVNe 4A20yX/EZWM/GvPcxyawA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ZxLykz5LGys=:+p7Bs4gkDy4FXSZRoQpmuj T3tG7DoN2+NwJcmreWpEQmsRtEZDpBP/SNaP4ykRIaG90XRrkHs+wrw5dPxQ2/li7AhIaYOEt c5LxKeGbpA4XEJMZMPWHcoVsnWRSjMs3MxQNBiV3VUSlGY+Lhayjbi9CgcOa+xdJaG9e/Ay5U fj96ThtA1FTp9y3MQWP+R3OFuKbdAFIl2v6Evra27VDzcU4GiQNiRra8GRnKOuSUvFxgNqshM SOMBDV6K/QodNzouivzsffu2dttaCcSV7CrBUGTQczOe0NvgI9Ok76dKX6rkU7FLphAbnDJy8 SR0nPHb+QOg5mNgGqbYWp4WyqE8Clvj1fC1BcYvibq3FIT9cfaRPSmhMMYhye1QcPM77WhcWW erL2i1U/mGRZpBfbOOjWzX9SH3I5cAN4pPH8qyxDRpkO+B629MKZiuILMgJo4tVksPtFAVnbN D7FCh9G0vbGUGmLy1U9yncFT4p6/W+6K0C9ywMBN5j96i4e62mZ97H5qo8QDQcXFeJV5BJsCx kDUryCHI9roDykhd636ddlE6dAhRFRnoc1mJaXWzVv7zczQgLBmgIY6/KEk3SBCMfq1LAhFnv uE6ml4t4EmxfUmfemNLB+nkIe9HNon4Gzc4a40a4Fd/zXcOuzOLe8CkQtqG8iN2ZDaGmENtVQ FsOxrDucJxthtT8PTqVXTyFJhPpDc7i+2dczeOuS9FnAFk/h2ShBQyNvuVuk6pIqUD5aNfqGR 5u2v5jMzeH+IDoMisWsurb9xdKfGdoV1djeHjfIKJfFak5bVvpOFkDuvZlt2fzVIW2LdKEBld 2McK95z Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 11 Sep 2016 14:48:41 +0200 * Pass the sizes for memory allocations to the corresponding functions directly without storing the calculated values in an intermediate variable. * Delete the local variable "size" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index d61a066..c1da844 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5833,7 +5833,6 @@ again: static int rbd_dev_image_id(struct rbd_device *rbd_dev) { int ret; - size_t size; char *object_name; void *response; char *image_id; @@ -5854,17 +5853,16 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev) * First, see if the format 2 image id file exists, and if * so, get the image's persistent id from it. */ - size = sizeof (RBD_ID_PREFIX) + strlen(rbd_dev->spec->image_name); - object_name = kmalloc(size, GFP_NOIO); + object_name = kmalloc(sizeof(RBD_ID_PREFIX) + + strlen(rbd_dev->spec->image_name), + GFP_NOIO); if (!object_name) return -ENOMEM; sprintf(object_name, "%s%s", RBD_ID_PREFIX, rbd_dev->spec->image_name); dout("rbd id object name is %s\n", object_name); /* Response will be an encoded string, which includes a length */ - - size = sizeof (__le32) + RBD_IMAGE_ID_LEN_MAX; - response = kzalloc(size, GFP_NOIO); + response = kzalloc(sizeof(__le32) + RBD_IMAGE_ID_LEN_MAX, GFP_NOIO); if (!response) { ret = -ENOMEM; goto out; -- 2.10.0