[PATCH] xfs_quota: fix false error reporting of project inheritance flag is not set

[PATCH] xfs_quota: fix false error reporting of project inheritance flag is not set

[Achilles Gaikwad]

xfs_quota project check results in "project inheritance flag is not set" error
https://bugzilla.redhat.com/show_bug.cgi?id=1663502

Reported-by: Steven Gardner <sgardner@redhat.com>
Signed-off-by: Achilles Gaikwad <agaikwad@redhat.com>
---
 quota/project.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quota/project.c b/quota/project.c
index e4e7a012..8c9be08b 100644
--- a/quota/project.c
+++ b/quota/project.c
@@ -99,6 +99,7 @@ check_project(
 {
 	struct fsxattr		fsx;
 	int			fd;
+	int			isdir;
 
 	if (recurse_depth >= 0 && data->level > recurse_depth)
 		return -1;
@@ -126,7 +127,8 @@ check_project(
 			printf(_("%s - project identifier is not set"
 				 " (inode=%u, tree=%u)\n"),
 				path, fsx.fsx_projid, (unsigned int)prid);
-		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT))
+		isdir = S_ISDIR(stat->st_mode);
+		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) && isdir)
 			printf(_("%s - project inheritance flag is not set\n"),
 				path);
 	}
-- 
2.20.1

Re: [PATCH] xfs_quota: fix false error reporting of project inheritance flag is not set

[Darrick J. Wong]

On Sat, Jan 05, 2019 at 03:56:01PM +0530, Achilles Gaikwad wrote:
> xfs_quota project check results in "project inheritance flag is not set" error
> https://bugzilla.redhat.com/show_bug.cgi?id=1663502
> 
> Reported-by: Steven Gardner <sgardner@redhat.com>
> Signed-off-by: Achilles Gaikwad <agaikwad@redhat.com>
> ---
>  quota/project.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/quota/project.c b/quota/project.c
> index e4e7a012..8c9be08b 100644
> --- a/quota/project.c
> +++ b/quota/project.c
> @@ -99,6 +99,7 @@ check_project(
>  {
>  	struct fsxattr		fsx;
>  	int			fd;
> +	int			isdir;

Use bool for boolean values, or...

>  
>  	if (recurse_depth >= 0 && data->level > recurse_depth)
>  		return -1;
> @@ -126,7 +127,8 @@ check_project(
>  			printf(_("%s - project identifier is not set"
>  				 " (inode=%u, tree=%u)\n"),
>  				path, fsx.fsx_projid, (unsigned int)prid);
> -		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT))
> +		isdir = S_ISDIR(stat->st_mode);
> +		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) && isdir)

...move the S_ISDIR test directly into the if condition test?

Otherwise looks fine to me.

--D

>  			printf(_("%s - project inheritance flag is not set\n"),
>  				path);
>  	}
> -- 
> 2.20.1
> 

Re: [PATCH] xfs_quota: fix false error reporting of project inheritance flag is not set

[Eric Sandeen]

On 1/5/19 4:26 AM, Achilles Gaikwad wrote:
> xfs_quota project check results in "project inheritance flag is not set" error

Thanks for doing this.

> https://bugzilla.redhat.com/show_bug.cgi?id=1663502

As I mentioned in the bug, this started happening after:

commit 9336e3a765b68d4a7fdd8256f393ebce95ecb0a7
Author: Dave Chinner <dchinner@redhat.com>
Date:   Thu Oct 2 09:18:40 2014 +1000

    xfs: project id inheritance is a directory only flag
    
    xfs_set_diflags() allows it to be set on non-directory inodes, and
    this flags errors in xfs_repair. Further, inode allocation allows
    the same directory-only flag to be inherited to non-directories.
    Make sure directory inode flags don't appear on other types of
    inodes.
    
    This fixes several xfstests scratch fileystem corruption reports
    (e.g. xfs/050) now that xfstests checks scratch filesystems after
    test completion.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Brian Foster <bfoster@redhat.com>
    Signed-off-by: Dave Chinner <david@fromorbit.com>


which is present in v3.18 upstream.  i.e. we stopped setting the
project inheritance flag on regular files in the kernel, but quotacheck
still looks for it in userspace.

It's good to write changelogs that will give full context to future readers,
so something like this might be more useful:

===

After kernel commit:

9336e3a7 "xfs: project id inheritance is a directory only flag"

xfs stopped setting the project inheritance flag on regular files, but
userspace quota code still checks for it and will now issue the error:

"project inheritance flag is not set"

for every regular file during quotacheck.  Fix this by only checking
for the flag on directories.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1663502
Reported-by: Steven Gardner <sgardner@redhat.com>
Signed-off-by: Achilles Gaikwad <agaikwad@redhat.com>

===

But the change itself is fine, so:

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

Also, this should really have an xfstest, because it's been broken
for a long time, and only just now turned up...

Thanks,
-Eric

> 
> Reported-by: Steven Gardner <sgardner@redhat.com>
> Signed-off-by: Achilles Gaikwad <agaikwad@redhat.com>
> ---



>  quota/project.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/quota/project.c b/quota/project.c
> index e4e7a012..8c9be08b 100644
> --- a/quota/project.c
> +++ b/quota/project.c
> @@ -99,6 +99,7 @@ check_project(
>  {
>  	struct fsxattr		fsx;
>  	int			fd;
> +	int			isdir;
>  
>  	if (recurse_depth >= 0 && data->level > recurse_depth)
>  		return -1;
> @@ -126,7 +127,8 @@ check_project(
>  			printf(_("%s - project identifier is not set"
>  				 " (inode=%u, tree=%u)\n"),
>  				path, fsx.fsx_projid, (unsigned int)prid);
> -		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT))
> +		isdir = S_ISDIR(stat->st_mode);
> +		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) && isdir)
>  			printf(_("%s - project inheritance flag is not set\n"),
>  				path);
>  	}
> 

Re: [PATCH] xfs_quota: fix false error reporting of project inheritance flag is not set

[Eric Sandeen]

On 1/5/19 11:46 AM, Darrick J. Wong wrote:
> On Sat, Jan 05, 2019 at 03:56:01PM +0530, Achilles Gaikwad wrote:
>> xfs_quota project check results in "project inheritance flag is not set" error
>> https://bugzilla.redhat.com/show_bug.cgi?id=1663502
>>
>> Reported-by: Steven Gardner <sgardner@redhat.com>
>> Signed-off-by: Achilles Gaikwad <agaikwad@redhat.com>
>> ---
>>  quota/project.c | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/quota/project.c b/quota/project.c
>> index e4e7a012..8c9be08b 100644
>> --- a/quota/project.c
>> +++ b/quota/project.c
>> @@ -99,6 +99,7 @@ check_project(
>>  {
>>  	struct fsxattr		fsx;
>>  	int			fd;
>> +	int			isdir;
> 
> Use bool for boolean values, or...
> 
>>  
>>  	if (recurse_depth >= 0 && data->level > recurse_depth)
>>  		return -1;
>> @@ -126,7 +127,8 @@ check_project(
>>  			printf(_("%s - project identifier is not set"
>>  				 " (inode=%u, tree=%u)\n"),
>>  				path, fsx.fsx_projid, (unsigned int)prid);
>> -		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT))
>> +		isdir = S_ISDIR(stat->st_mode);
>> +		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) && isdir)
> 
> ...move the S_ISDIR test directly into the if condition test?

Yup, since isdir is only used once I thought the same thing, TBH.

-Eric

> 
> Otherwise looks fine to me.
> 
> --D
> 
>>  			printf(_("%s - project inheritance flag is not set\n"),
>>  				path);
>>  	}
>> -- 
>> 2.20.1
>>
> 

Re: [PATCH] xfs_quota: fix false error reporting of project inheritance flag is not set

[Achilles Gaikwad]

Thanks Darrick and Eric, I'll move the macro into the if condition and
send a v2 for this.

Best,
- Achilles