From patchwork Wed Feb 21 10:43:58 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: 204151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp955324dyc; Wed, 21 Feb 2024 02:45:26 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWE0OcK9JJeYBEDU0CewmMxddPvA+57JgS6TtqGCFxPaaxq5qapVIsz/N9eOefpF5rNCGOMwNyP9GkhFjyzXCaAGQpmrw== X-Google-Smtp-Source: AGHT+IHEDzegdQJRf7j6bCNPQ2ssFKSqH7C9Vf49vH6vk/a2k4pS8Yr4YW4HBmsvIPOE9XVYcUHQ X-Received: by 2002:a05:6808:220f:b0:3bf:fdb2:ca5b with SMTP id bd15-20020a056808220f00b003bffdb2ca5bmr21748241oib.3.1708512325885; Wed, 21 Feb 2024 02:45:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708512325; cv=pass; d=google.com; s=arc-20160816; b=xOjzirZef1oge961uW8I7g2QoBnYu+d+QD0CMItoz0THdr5WwImv/N1krSa5XVLbVW SeuPlsuuFZey7XZTUalFB8nSeahIL6NcODcngIYR8FMkGOB4qGMpcyYfxbHySEmr97Mw fb+bxUSkgRCWPVnfuupTVme+RJywOYMHsi29YoTGFI7rVNp1oaa2iVwVKqB/2qV1sAEe EHF2rNgF5rFF47DBzPBtvJ7bQ6nsj1UcXoTUDpv4nixersiBiuUHSNl1a0wPBsEg62+u SrVxqk43LbkicXeuhArvKrWrr0oHjodNg2+IC/RZOzQHXzjptx+pOPnLnEuAxKCK9fDd cXFQ== 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=wGDrQZTzh/FxaCxKf82v2ZAzAOIoBiv5hFvTB8Pb5uA=; fh=CLsNYrhZoUT4hoGFChFFOFXI1wDpxLJ7EzURFs5Xbjs=; b=l/FrwflTcCuMUfSf+SZIF6pMxO1DD+2aVLrazHf62uwnOtKcvcsfS6LYkk7n9rYkzg Gng29cCDmfun7KDoRC/w6eMA98YP9OgrDVuQXwKI81/WjaXK1OIP0oZUj3Wgtq3tN7jI 446Fi/cFjQrC6u7/yBPqoXgYhvail6/95zofj6PbJkpPh8DvbPmHNVYkpEocak6sPF14 puEH0hWA6INQMp0xDHy3fO+DqXZsgKm6JpozYxmp9Dku8TnYQhSTUCAPtNf700/XjaMV eh4Mnpvvwdy8SgIMT/GUAIADLiq9qt2bvNSHuYYptUcXgU/sk/3T/KtmMFKg/qcS5PSV Gadw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@posteo.net header.s=2017 header.b=Oi6z7vhJ; 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-74555-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74555-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.net Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id bz22-20020a056a02061600b005dc8915c9cesi8232741pgb.381.2024.02.21.02.45.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 02:45:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74555-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@posteo.net header.s=2017 header.b=Oi6z7vhJ; 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-74555-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74555-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 335E1283FFA for ; Wed, 21 Feb 2024 10:45:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D32363D566; Wed, 21 Feb 2024 10:45:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=posteo.net header.i=@posteo.net header.b="Oi6z7vhJ" Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) (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 E614620DC5 for ; Wed, 21 Feb 2024 10:44:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.67.36.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708512298; cv=none; b=APwo/Gwv1WbevbwIaxJSFYi97sM4W//cR8w0S6VgmuP1+YxVRz9dNe8JSXo/kryDC8sZvLfPd40p7XRZw9Tgb0KIKMMY9qwadJ9xTSiTf5r9fHIcfa9wewSU0DUxzMOECons0FUJoW8x7h65bY0m2VmSrgY1I1bRrUbXOAuJRHU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708512298; c=relaxed/simple; bh=ghhI+nFDhm0hnOFhmWeoRf94hHK/gPArrHEfJeQ/EBo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=YdfLR8iD5lPmueli5XEe+a6/vnZJr/FaP9CnVFQhKBkoAe3yNIZW3PigZ5Q6r2LzDU5ZIeimeyoLdbUpJpysRTs9nrxPo5A0eVHsvoyy0+TG3QxKvdu4cWNTOOJSFf4M2gkRIWEOpHqx3XqJkGc5h4yvI31qnpsNNtCb7+DABgM= 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=Oi6z7vhJ; arc=none smtp.client-ip=185.67.36.65 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 mout01.posteo.de (Postfix) with ESMTPS id 30210240027 for ; Wed, 21 Feb 2024 11:44:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1708512288; bh=ghhI+nFDhm0hnOFhmWeoRf94hHK/gPArrHEfJeQ/EBo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=Oi6z7vhJIUx+/QyafXRCdMFngP+BSIvcY4JjGHxacW4b1sOP3E3NwYU4dNHaI9ezt f/P1ez3QdLHnQV1U2citr8UM1vMw+UDavSuJ7VN8u0sYt8h0TbREiEPUMg2pmG/hcp jLKaQsRSsX/FoRwaRxSsMC2J8Xgx9xa1BEypPPVdlt6ImkK6CTYmglfVATfDWtTYdp x3HHNmftGJP6VJMQffun7ragIxowbF3Na86f8ukyd8lNmDRlSjg+5KK3pDEGwiwd/N 5SPbgaN+rjV9ouUlLFRwu6pAz4RG4ZcyPgQVT9cpgfBiQkVZVVpbRG7XkNGsDsLKUS iqPuJTJxV+EEg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TftFV4nPvz6twm; Wed, 21 Feb 2024 11:44:46 +0100 (CET) From: Mark O'Donovan To: linux-kernel@vger.kernel.org Cc: ntfs3@lists.linux.dev, almaz.alexandrovich@paragon-software.com, chris2553@googlemail.com, regressions@leemhuis.info, Mark O'Donovan Subject: [PATCH v2] fs/ntfs3: fix build without CONFIG_NTFS3_LZX_XPRESS Date: Wed, 21 Feb 2024 10:43:58 +0000 Message-Id: <20240221104358.2290969-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: 1791505020716720759 X-GMAIL-MSGID: 1791505020716720759 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 Fixes: 4fd6c08a16d7 ("fs/ntfs3: Use i_size_read and i_size_write") Tested-by: Chris Clayton --- fs/ntfs3/frecord.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 9fc1ccccfd8d53dc7936fe6d633f2373fc9f62e8 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;