Received: by 2002:ab2:6309:0:b0:1fb:d597:ff75 with SMTP id s9csp995210lqt; Fri, 7 Jun 2024 05:19:38 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXj7iHYILufczKNiN8HRVIhGc8tHt+SlG9QOPIaDDclNfzM8Nkh66BLGggfZgZGkzpBznqO4+eMaXR7t0SShmzUtKbxzfjktRdTe7yDAA== X-Google-Smtp-Source: AGHT+IHorE9dz+9t4pzalhNTVJgGzLp6lWLz2MtyxsydVYkfF5rFwaYUudOGPmqpbUzy334pp+Pr X-Received: by 2002:a17:906:2c16:b0:a68:a800:5f7e with SMTP id a640c23a62f3a-a6cd561f12cmr166845466b.10.1717762778732; Fri, 07 Jun 2024 05:19:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717762778; cv=pass; d=google.com; s=arc-20160816; b=MBARSdFmMhbIfbXgIUWLx4FnZxN/10dnSID2a+w72GujVLH74zkItsXFJz274Oex0N NvML2gSbAHw8eokgYWU6nnm60/31exrqUDHaG+RpU3JLdRX+/IaSPNSL2KP5GoWePOBn 65vaQl5JtoMWyOeTEqL1GbjacfJWFpoBNkdFs4+uTdUg4CvWsweLoS8fpHIjpnn7BS7B 2wdSUK8R6L4ud0bravOgegJZWgNx387DKM5zeZT2mkePcxgUr9ois2HRjCl/eG7b5Fqk svfdjdaPjRZONDjMi5lk1U26s7YTIu/CFOM6xNm3/eHvM48h17zGXm7rJqPnzcuTbfx7 YuhQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:dkim-signature; bh=0jJtz0eUYHftgd+JKDAtTz3HVvB1qMm8PesV+dw6f8Q=; fh=xoZo938iZo6Zo9BQRi1y1Y/2pdszedQYQQiMhZQzvOk=; b=kOaugZW0dBYYxIaZYBi3NfTGgw1GSBC4pnoBGsIlmIts2sy2Zz1JsfsEShtZuCxuy8 ZRL+F/+86bGyLBmOddd6nMZX115AThtDGr69KqzLl8jvuhK0CJo+97vyLMoeqiOw3dW6 QzFxOP20WlppAsEOkzLbODWH1zR93AUFT7ieQ5rRHbyKchYeJxjEECDsT/hNa/AwUt7E xX0De4DIdjmCl7Hc+najQ535iLihDjiN7NZvIDubjres1nTfx0gChzO48OvjrMaDtida U4x2wL7z9LffOZgnAk9sBiMo3rBgCln+egD3fNdalnP63N7QATFvE5it0jBwADaQPiUP PuJA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@paragon-software.com header.s=mail header.b=QUmZvKhN; dkim=pass header.i=@paragon-software.com header.s=mail header.b=iExIxDTN; arc=pass (i=1 spf=pass spfdomain=paragon-software.com dkim=pass dkdomain=paragon-software.com dkim=pass dkdomain=paragon-software.com dmarc=pass fromdomain=paragon-software.com); spf=pass (google.com: domain of linux-kernel+bounces-206005-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-206005-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=paragon-software.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id a640c23a62f3a-a6c806dba44si168474366b.282.2024.06.07.05.19.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 05:19:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-206005-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@paragon-software.com header.s=mail header.b=QUmZvKhN; dkim=pass header.i=@paragon-software.com header.s=mail header.b=iExIxDTN; arc=pass (i=1 spf=pass spfdomain=paragon-software.com dkim=pass dkdomain=paragon-software.com dkim=pass dkdomain=paragon-software.com dmarc=pass fromdomain=paragon-software.com); spf=pass (google.com: domain of linux-kernel+bounces-206005-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-206005-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=paragon-software.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 6A7DC1F21E51 for ; Fri, 7 Jun 2024 12:19:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8F91C1991C4; Fri, 7 Jun 2024 12:16:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=paragon-software.com header.i=@paragon-software.com header.b="QUmZvKhN"; dkim=pass (1024-bit key) header.d=paragon-software.com header.i=@paragon-software.com header.b="iExIxDTN" Received: from relayaws-01.paragon-software.com (relayaws-01.paragon-software.com [35.157.23.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76011197A64; Fri, 7 Jun 2024 12:16:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=35.157.23.187 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717762588; cv=none; b=gLRQo7zjo8bC/P2JqqJNQOGsScc/7whTbZTsLqopx95/vnV+MMhKOKkAxcFvg1u/BUI7Ec3OBoMDd8+yWCYAdO/LzmbtMDpsMiTRr9tJXL5lz8/qU6mOAPpW+cRZmpgm3VowURyjTOmCG8ZN2Nbb8FTADCHtt1dNSXGEkihWTBI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717762588; c=relaxed/simple; bh=nUHidUzz1T0S+HSHLdTUekBbn8Zo3THzDfTfWfN6Fxg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LhnuHxhGgDUUV/zN9uk6Le5GSggsMWm+gcEvFGdjJd8AWix+24JM5P3H1nT82D1aNk4hokiGAwQv18duV+PXKsPdtStPYz0qpDekpowitIr2amt80Ir2LNdKuSyaLZulS5+TYjIIquscYsWnR3ffb6YFqf5Zb3fPXnbA0SFlxsY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=paragon-software.com; spf=pass smtp.mailfrom=paragon-software.com; dkim=pass (1024-bit key) header.d=paragon-software.com header.i=@paragon-software.com header.b=QUmZvKhN; dkim=pass (1024-bit key) header.d=paragon-software.com header.i=@paragon-software.com header.b=iExIxDTN; arc=none smtp.client-ip=35.157.23.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=paragon-software.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=paragon-software.com Received: from relayfre-01.paragon-software.com (unknown [172.30.72.12]) by relayaws-01.paragon-software.com (Postfix) with ESMTPS id C71EA2113; Fri, 7 Jun 2024 12:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paragon-software.com; s=mail; t=1717762111; bh=0jJtz0eUYHftgd+JKDAtTz3HVvB1qMm8PesV+dw6f8Q=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=QUmZvKhNWmQeghV5foiFsHvMMLNZxdC4rrv/gciu5yKSMaRs9UEunl87NjmLUtwz0 xb1NXGbvK8QhVlmmD3B86J0qPNg8ZevJUxZDF180ECHRzJHpMEwSWgyzKReU+A8FiQ y42xXxSUEo/LQs85b592lzrezQVtEAbQe7TdBgfs= Received: from dlg2.mail.paragon-software.com (vdlg-exch-02.paragon-software.com [172.30.1.105]) by relayfre-01.paragon-software.com (Postfix) with ESMTPS id A992B195; Fri, 7 Jun 2024 12:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paragon-software.com; s=mail; t=1717762585; bh=0jJtz0eUYHftgd+JKDAtTz3HVvB1qMm8PesV+dw6f8Q=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=iExIxDTNNCzD5gq6CrHZ52od/rxFwKtPrfC7rcG9j3Ja4yxGlpTMVbsmVFDKT20vh 8unw3dAhlSuXpABY6Ay4p8t1xp/DMxhwtGUjIG7dwZkPSA4vAnAcz6pb2DmWGaRmux mmTLRR4Vv6WAc3T35edJrUp03zzauar8qPtNHsnE= Received: from ntfs3vm.paragon-software.com (192.168.211.95) by vdlg-exch-02.paragon-software.com (172.30.1.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Fri, 7 Jun 2024 15:16:25 +0300 From: Konstantin Komarov To: CC: , , Konstantin Komarov Subject: [PATCH 17/18] fs/ntfs3: Rename variables Date: Fri, 7 Jun 2024 15:15:47 +0300 Message-ID: <20240607121548.18818-18-almaz.alexandrovich@paragon-software.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240607121548.18818-1-almaz.alexandrovich@paragon-software.com> References: <20240607121548.18818-1-almaz.alexandrovich@paragon-software.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: vdlg-exch-02.paragon-software.com (172.30.1.105) To vdlg-exch-02.paragon-software.com (172.30.1.105) New names make it easier to read code. Signed-off-by: Konstantin Komarov --- fs/ntfs3/fslog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c index 6049ba33d384..389fce092d6d 100644 --- a/fs/ntfs3/fslog.c +++ b/fs/ntfs3/fslog.c @@ -4243,9 +4243,9 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) } t32 = lrh_length(lrh); - rec_len -= t32; + attr_names_bytes = rec_len - t32; - attr_names = kmemdup(Add2Ptr(lrh, t32), rec_len, GFP_NOFS); + attr_names = kmemdup(Add2Ptr(lrh, t32), attr_names_bytes, GFP_NOFS); if (!attr_names) { err = -ENOMEM; goto out; @@ -4277,14 +4277,14 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) t16 = le16_to_cpu(lrh->redo_off); rt = Add2Ptr(lrh, t16); - t32 = rec_len - t16; + oatbl_bytes = rec_len - t16; - if (!check_rstbl(rt, t32)) { + if (!check_rstbl(rt, oatbl_bytes)) { err = -EINVAL; goto out; } - oatbl = kmemdup(rt, t32, GFP_NOFS); + oatbl = kmemdup(rt, oatbl_bytes, GFP_NOFS); if (!oatbl) { err = -ENOMEM; goto out; -- 2.34.1