From patchwork Wed Feb 14 22:45:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark O'Donovan X-Patchwork-Id: 201170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp28225dyb; Wed, 14 Feb 2024 14:46:04 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXOLz7Z25E1AyDq0eAaDE20fDlAkfzN8+NZ7mAVskAV8oKpGJdqY1h80tIpgfDJFrjTBGC36NcehFGQ1Z4hxcXp3j4O4A== X-Google-Smtp-Source: AGHT+IHhwd+WxHiJG0uYG1KyZXDr4pLpRrnuxQRPBN+MzX67aTI7SLmjF8coRS/fNRlyaBtVGo0A X-Received: by 2002:a05:6402:2cd:b0:561:f236:a480 with SMTP id b13-20020a05640202cd00b00561f236a480mr21068edx.7.1707950763960; Wed, 14 Feb 2024 14:46:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707950763; cv=pass; d=google.com; s=arc-20160816; b=KqGW7Kf4AVKbrzRbZShm6P99yFoEUlft70/Ajka2Eh8c2wN1F+QdenlEApDEVqG3jl GDw0Ye1LJjehF8t+uY7dfC0LvTAtc4mQSwkbUbfIVtd9FPHhet7XRuvPBPwnk58BJCjy uqL9jtMmg5fkbHC8+jDo805d5V8MjdRboUk0lSF/w4k25GgJNzojHlnlkFJr5+pxvuTP qNDsnnv8AfXNDPga0MrQ143vDBSeU8Sd/lDNOs+FstmmEtxJoLTODUnMuDR1WyIIV+Ec v08no2SPOSSTr10hXN0eM+lBgvF35EmEzCPgdY+fTHDQSxQFBTzdLmQBRwv3pbNbOHOZ DD2Q== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=PzpXxc0NagIrRkYmQqLuipB8ej/n69Q713FgJEf3E4Y=; fh=JdIUlIM1KJCHAqAd7M1hiYMIMFMO/8my9x4JrKQomrg=; b=IbACAtm6WLFsX7e/XpLmTJisfD8jsz4ZU+a1hr5ahJ3d5rmVBujoxSmUxVc1tDI+Iq z3rabT+vLVh5XlKSx/IBG4WEhk0PGOHmiJkt6CvbGaHuaXlDFYFjnIC6B0uTGIV/6Ewj 1tIvBPVF1mA4PexMu6ipTkvkXNXISoko5o8Kfx/0D2STEiI8F2mVnPro2OyqIajQvcA2 qreU+RBxDfjWlX4ES8dJ0nzna3MhgOXKbBPPZIp19D1B5CoqQwTzmnAORT+rveqx72ss /amIY2VOn30Xoz5EhAc7ANsIQaTcP5pfIfY+YGwTe0RUgVIOaPGUeSadta0+7tghGlJP J5+Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@posteo.net header.s=2017 header.b=cy9W9ytx; arc=pass (i=1 spf=pass spfdomain=posteo.net dkim=pass dkdomain=posteo.net dmarc=pass fromdomain=posteo.net); spf=pass (google.com: domain of linux-kernel+bounces-66075-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66075-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.net X-Forwarded-Encrypted: i=2; AJvYcCXtTwjTV/Fp9c3dtxJilEnkTycyNlNAFIDd4BTAF62AFkBb1lYqZbpfCPBfhbdmVqCZZ7Yga86B+KX66qwMPkgseeVS+g== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id q14-20020a056402518e00b00561a132c31asi4044193edd.193.2024.02.14.14.46.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 14:46:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-66075-ouuuleilei=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=@posteo.net header.s=2017 header.b=cy9W9ytx; arc=pass (i=1 spf=pass spfdomain=posteo.net dkim=pass dkdomain=posteo.net dmarc=pass fromdomain=posteo.net); spf=pass (google.com: domain of linux-kernel+bounces-66075-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66075-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.net 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 87B0A1F2D0ED for ; Wed, 14 Feb 2024 22:46:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4B89A5647F; Wed, 14 Feb 2024 22:45:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=posteo.net header.i=@posteo.net header.b="cy9W9ytx" Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) (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 D70D61DDC1 for ; Wed, 14 Feb 2024 22:45:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.67.36.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707950747; cv=none; b=EPWoXY++6kLO3Eon7UjLexzBtfj3pqJ3dAn3/ajdi51lAte2fSr+8T0P/4iPH7TZol8Qq6hoL3HLUK8fKEVNffvw12HHqXsLd2WJ/4c0eCi6FGtH5GSeuFX/ggkmrQCmAcPz5CjEVwrY+6L3kG0AxV4haB5R2tm+Aq61iHPU8c0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707950747; c=relaxed/simple; bh=Tmfl2Q2d9LtThpZUB2HoXDesIEkpD1mXThibjey9ijo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=V4+qpJrsdOtU+eVEbBZZ//ob0uUX9PT4ZHDXONnsCV87c+/6XlpnTJUoD8DgpX6/RX9io6woXOxy5I1cYaMFr63t6NUOvCVttMA8SJ5uO7wDBtwUIMsYPS4Ec3HrmSUzMm4+BaVky+2Qt0N8VVqUHlrZZ7mRuL9XioaxwmNNpDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=posteo.net; spf=pass smtp.mailfrom=posteo.net; dkim=pass (2048-bit key) header.d=posteo.net header.i=@posteo.net header.b=cy9W9ytx; arc=none smtp.client-ip=185.67.36.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=posteo.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=posteo.net Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 01A25240101 for ; Wed, 14 Feb 2024 23:45:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707950742; bh=Tmfl2Q2d9LtThpZUB2HoXDesIEkpD1mXThibjey9ijo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=cy9W9ytxBHqdbX1LWIcnKyakyzujdS1CDgOswvp3yHNu9CIHa996sftEFlzRwX8v5 4osnsakbSXxk8Eny1TzcM6aVjIxPUCvFvyj7t37tZRtOjBaNWv48El3+R77WrrHIK5 SOHA/KYMt03jCx6yI55QikoA/GgBTwbXhZB0jGF0gDF+KYDDEXm2IltvEf21lDWHfk t6TDpOWT8YLsK6fdcbljEosSS405wyd2Pr0/J8Y06pYkydheW0KdMv8AW6G3Ee5XK/ 2IgKYNzf4ZIJ094ql04cBMrAUZ3HLjxGGWqNukhm0WKcPrw0UqRoESdJKObvWPBobG WTM7HfPpfgEkg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TZtZY0DPtz6tw2; Wed, 14 Feb 2024 23:45:40 +0100 (CET) From: Mark O'Donovan To: linux-kernel@vger.kernel.org Cc: ntfs3@lists.linux.dev, almaz.alexandrovich@paragon-software.com, Mark O'Donovan Subject: [PATCH] fs/ntfs3: fix build without CONFIG_NTFS3_LZX_XPRESS Date: Wed, 14 Feb 2024 22:45:00 +0000 Message-Id: <20240214224500.811609-1-shiftee@posteo.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790916179971418024 X-GMAIL-MSGID: 1790916179971418024 When CONFIG_NTFS3_LZX_XPRESS is not set then we get the following: fs/ntfs3/frecord.c:2460:16: error: unused variable ‘i_size’ Signed-off-by: Mark O'Donovan Tested-by: Chris Clayton --- fs/ntfs3/frecord.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 7e90b5c295ec1e47c8ad865429f046970c549a66 diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c index 3b42938a9d3b..7f27382e0ce2 100644 --- a/fs/ntfs3/frecord.c +++ b/fs/ntfs3/frecord.c @@ -2457,7 +2457,6 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages, struct ATTR_LIST_ENTRY *le = NULL; struct runs_tree *run = &ni->file.run; u64 valid_size = ni->i_valid; - loff_t i_size = i_size_read(&ni->vfs_inode); u64 vbo_disk; size_t unc_size; u32 frame_size, i, npages_disk, ondisk_size; @@ -2509,6 +2508,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages, err = -EOPNOTSUPP; goto out1; #else + loff_t i_size = i_size_read(&ni->vfs_inode); u32 frame_bits = ni_ext_compress_bits(ni); u64 frame64 = frame_vbo >> frame_bits; u64 frames, vbo_data;