From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7AEC5ECDE44 for ; Fri, 26 Oct 2018 18:00:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4696420868 for ; Fri, 26 Oct 2018 18:00:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="NC8vY7mA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4696420868 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727832AbeJ0Ciw (ORCPT ); Fri, 26 Oct 2018 22:38:52 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:34485 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727450AbeJ0Ciw (ORCPT ); Fri, 26 Oct 2018 22:38:52 -0400 Received: by mail-pg1-f193.google.com with SMTP id g12-v6so897248pgs.1 for ; Fri, 26 Oct 2018 11:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xORB1O948yXmjo6CVsJmH/F5wE/cvg8rBKIybdc1m0A=; b=NC8vY7mAOkBy7Bb7Qns7VBp4vYo/1pXarNWjUbQOvDjcZY0K8vQobO9r1+bw4YM38X qa66wb8AL5f0RobhX6phqI0EY+lk+LkY45KGtKxR5637rwPFg4MQlYsPyoZkjdDaKG0U ry2B7j+XUmyMNqcUT87lWv9lMRfvBG5HlQ1zU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xORB1O948yXmjo6CVsJmH/F5wE/cvg8rBKIybdc1m0A=; b=SUsgyVC+cx6/PLvYBc8VFS6QagPPG53XvzHfr2A4L3ZHdK0iREa3WiNG7xfj5JrruB 84PgGaZdXuFmE/Pu6w8npR1b94Za6yaj2txW/f1PqQVj6/DAqMC61j7ikVoLPKFvXn0A E92VDSKtR3GcTxrs7RjK94lclctsHqTKhOwrXTDP37s4teh2/7VxohmHbQhK9LwBpqA3 mQa1LvTACPYyJhxbc2SVvcg0HubeRbwWVW+rjXDwfO26aO6/1bqvL1z6RniqEv6tdVt3 8haNllAlEsawljBhzlxPBo7Bd0aRUuywJZQXjbuXUNNuwfGjAq3vp/Gq+1KS3O4A6uCz YXQQ== X-Gm-Message-State: AGRZ1gKdLubNMYYs0hlgV2s1sXy55O05itEUmg3KkJsttoWYoubttMzE Bvlq/cjnyiJqcrU2nwKcmuMo195VK18= X-Google-Smtp-Source: AJdET5c0UhHKtF+gjsSra7erdK34CdEWszn51SsOFDyzsS17vGGblygF/5JTt895eKS08q46u7Ty/g== X-Received: by 2002:a63:42c1:: with SMTP id p184mr4399493pga.202.1540576853108; Fri, 26 Oct 2018 11:00:53 -0700 (PDT) Received: from joelaf.mtv.corp.google.com ([2620:0:1000:1601:3aef:314f:b9ea:889f]) by smtp.gmail.com with ESMTPSA id v5-v6sm17521243pfd.64.2018.10.26.11.00.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 11:00:51 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, "Joel Fernandes (Google)" , Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck Subject: [RFC 3/6] pstore: remove max argument from ramoops_get_next_prz Date: Fri, 26 Oct 2018 11:00:39 -0700 Message-Id: <20181026180042.52199-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog In-Reply-To: <20181026180042.52199-1-joel@joelfernandes.org> References: <20181026180042.52199-1-joel@joelfernandes.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >From the code flow, the 'max' checks are already being done on the prz passed to ramoops_get_next_prz. Lets remove it to simplify this function and reduce its arguments. Signed-off-by: Joel Fernandes (Google) --- fs/pstore/ram.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index cbfdf4b8e89d..3055e05acab1 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -124,14 +124,14 @@ static int ramoops_pstore_open(struct pstore_info *psi) } static struct persistent_ram_zone * -ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max, +ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, u64 *id, enum pstore_type_id *typep, bool update) { struct persistent_ram_zone *prz; int i = (*c)++; /* Give up if we never existed or have hit the end. */ - if (!przs || i >= max) + if (!przs) return NULL; prz = przs[i]; @@ -254,8 +254,7 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record) /* Find the next valid persistent_ram_zone for DMESG */ while (cxt->dump_read_cnt < cxt->max_dump_cnt && !prz) { prz = ramoops_get_next_prz(cxt->dprzs, &cxt->dump_read_cnt, - cxt->max_dump_cnt, &record->id, - &record->type, 1); + &record->id, &record->type, 1); if (!prz_ok(prz)) continue; header_length = ramoops_read_kmsg_hdr(persistent_ram_old(prz), @@ -271,17 +270,17 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record) if (!prz_ok(prz)) prz = ramoops_get_next_prz(&cxt->cprz, &cxt->console_read_cnt, - 1, &record->id, &record->type, 0); + &record->id, &record->type, 0); if (!prz_ok(prz)) prz = ramoops_get_next_prz(&cxt->mprz, &cxt->pmsg_read_cnt, - 1, &record->id, &record->type, 0); + &record->id, &record->type, 0); /* ftrace is last since it may want to dynamically allocate memory. */ if (!prz_ok(prz)) { if (!(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)) { prz = ramoops_get_next_prz(cxt->fprzs, - &cxt->ftrace_read_cnt, 1, &record->id, + &cxt->ftrace_read_cnt, &record->id, &record->type, 0); } else { /* @@ -299,7 +298,6 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record) while (cxt->ftrace_read_cnt < cxt->max_ftrace_cnt) { prz_next = ramoops_get_next_prz(cxt->fprzs, &cxt->ftrace_read_cnt, - cxt->max_ftrace_cnt, &record->id, &record->type, 0); -- 2.19.1.568.g152ad8e336-goog