2024-02-14 23:07:01

by Mark O'Donovan

Subject: [PATCH] fs/ntfs3: fix build without CONFIG_NTFS3_LZX_XPRESS

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 <[email protected]>
---
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
--
2.39.2

2024-02-19 07:21:22

by Chris Clayton

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 <[email protected]>
> ---
> 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 <[email protected]>

2024-02-21 08:27:27

by Chris Clayton

Subject: Re: [PATCH] fs/ntfs3: fix build without CONFIG_NTFS3_LZX_XPRESS

Hi

This build regression also shows up, along with other problems, in a report to the ntfs3 list by the kernel test robot.[1]

Also, as this patch seems not to have been picked up by the NTFS3 maintainer I've added Thorsten Leemhuis so he can
consider adding this egression to the tracker.

[1] https://lore.kernel.org/ntfs3/[email protected]/T/#u

Chris



On 19/02/2024 07:21, Chris Clayton wrote:
> 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 <[email protected]>
>> ---
>> 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 <[email protected]>

2024-02-21 09:23:28

by Thorsten Leemhuis

Subject: Re: [PATCH] fs/ntfs3: fix build without CONFIG_NTFS3_LZX_XPRESS

On 21.02.24 09:27, Chris Clayton wrote:
>
> This build regression also shows up, along with other problems, in a
> report to the ntfs3 list by the kernel test robot.[1]
>
> Also, as this patch seems not to have been picked up by the NTFS3
> maintainer I've added Thorsten Leemhuis so he can consider adding
> this egression to the tracker.

You mistyped my email address, but I noticed this by chance. :-D

Mark, could you do me a favor and send a v2 that picked up the Tested-by
and includes a Fixes: tag for the commit causing it? Then in case
Konstantin doesn't pick this up any time soon I'll ask Linus to pick
this up straight from the list.

Ciao, Thorsten

> [1]
> https://lore.kernel.org/ntfs3/[email protected]/T/#u>
> Chris>
> On 19/02/2024 07:21, Chris Clayton wrote:
>> 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 <[email protected]>
>>> ---
>>> 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 <[email protected]>