linux-kernel - Re: [PATCH] fs/ntfs3: fix build without CONFIG_NTFS3_LZX

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Mon, 19 Feb 2024 07:21:09 +0000
From: Chris Clayton <chris2553@...glemail.com>
To: Mark O'Donovan <shiftee@...teo.net>, linux-kernel@...r.kernel.org
Cc: ntfs3@...ts.linux.dev, almaz.alexandrovich@...agon-software.com
Subject: Re: [PATCH] fs/ntfs3: fix build without CONFIG_NTFS3_LZX_XPRESS

Hi.

On 14/02/2024 22:45, Mark O'Donovan wrote:
> 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 <shiftee@...teo.net>
> ---
>  fs/ntfs3/frecord.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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;
> 
> base-commit: 7e90b5c295ec1e47c8ad865429f046970c549a66

Mark - Thanks for the patch.
Alex - Fixes a build bug introduced by 4fd6c08a16d7f1ba10212c9ef7bc73218144b463.

Tested-by: Chris Clayton <chris2553@...glemail.com>