[11/11] vfs: Use tabs to indent, not spaces

Message ID	20230307114507.332309-12-rodrigo@sdfg.com.ar (mailing list archive)
State	New, archived
Headers	show Return-Path: <fstests-owner@vger.kernel.org> From: Rodrigo Campos <rodrigo@sdfg.com.ar> To: fstests@vger.kernel.org Cc: Christian Brauner <brauner@kernel.org>, Giuseppe Scrivano <gscrivan@redhat.com>, Rodrigo Campos <rodrigo@sdfg.com.ar> Subject: [PATCH 11/11] vfs: Use tabs to indent, not spaces Date: Tue, 7 Mar 2023 12:45:07 +0100 Message-Id: <20230307114507.332309-12-rodrigo@sdfg.com.ar> In-Reply-To: <20230307114507.332309-1-rodrigo@sdfg.com.ar> References: <20230307114507.332309-1-rodrigo@sdfg.com.ar> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Tests for idmapped tmpfs \| expand [00/11] Tests for idmapped tmpfs [01/11] vfs: Don't open-code safe_close() [02/11] vfs: Fix documentation typo [03/11] vfs: Fix race condition on get_userns_fd() [04/11] vfs: Make switch_userns set PR_SET_DUMPABLE [05/11] vfs: Specify wether a test is run inside a userns or not [06/11] vfs: Prepare tests in &s_idmapped_mounts to be reused inside a userns [07/11] vfs: Make idmapped core tests public [08/11] vfs: Export test_setup() and test_cleanup() [09/11] vfs: Add DIR0 constant [10/11] vfs: Add tmpfs tests for idmap mounts [11/11] vfs: Use tabs to indent, not spaces

Message ID

20230307114507.332309-12-rodrigo@sdfg.com.ar (mailing list archive)

State

New, archived

Headers

From: Rodrigo Campos <rodrigo@sdfg.com.ar>
To: fstests@vger.kernel.org
Cc: Christian Brauner <brauner@kernel.org>,
        Giuseppe Scrivano <gscrivan@redhat.com>,
        Rodrigo Campos <rodrigo@sdfg.com.ar>
Subject: [PATCH 11/11] vfs: Use tabs to indent, not spaces
Date: Tue,  7 Mar 2023 12:45:07 +0100
Message-Id: <20230307114507.332309-12-rodrigo@sdfg.com.ar>
In-Reply-To: <20230307114507.332309-1-rodrigo@sdfg.com.ar>
References: <20230307114507.332309-1-rodrigo@sdfg.com.ar>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Tests for idmapped tmpfs | expand

Comments

Christian Brauner March 7, 2023, 4:55 p.m. UTC | #1

On Tue, Mar 07, 2023 at 12:45:07PM +0100, Rodrigo Campos wrote:
> Signed-off-by: Rodrigo Campos <rodrigo@sdfg.com.ar>
> ---

I think I explicitly used spaces but I don't know why anymore tbh. So
I'll live that to Zorro whether he wants to take this patch or not. I
have no strong opinion. :)

>  src/vfs/vfstest.c | 30 +++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git src/vfs/vfstest.c src/vfs/vfstest.c
> index 3d75b1e3..dea344cc 100644
> --- src/vfs/vfstest.c
> +++ src/vfs/vfstest.c
> @@ -107,7 +107,7 @@ static int hardlink_crossing_mounts(const struct vfstest_info *info)
>  	int fret = -1;
>  	int file1_fd = -EBADF, open_tree_fd = -EBADF;
>  
> -        if (chown_r(info->t_mnt_fd, T_DIR1, 10000, 10000)) {
> +	if (chown_r(info->t_mnt_fd, T_DIR1, 10000, 10000)) {
>  		log_stderr("failure: chown_r");
>  		goto out;
>  	}
> @@ -2307,22 +2307,22 @@ static void usage(void)
>  	fprintf(stderr, "    Run idmapped mount tests\n\n");
>  
>  	fprintf(stderr, "Arguments:\n");
> -	fprintf(stderr, "--device                            Device used in the tests\n");
> -	fprintf(stderr, "--fstype                            Filesystem type used in the tests\n");
> -	fprintf(stderr, "--help                              Print help\n");
> -	fprintf(stderr, "--mountpoint                        Mountpoint of device\n");
> -	fprintf(stderr, "--idmapped-mounts-supported         Test whether idmapped mounts are supported on this filesystem\n");
> -	fprintf(stderr, "--scratch-mountpoint                Mountpoint of scratch device used in the tests\n");
> -	fprintf(stderr, "--scratch-device                    Scratch device used in the tests\n");
> -	fprintf(stderr, "--test-core                         Run core idmapped mount testsuite\n");
> -	fprintf(stderr, "--test-fscaps-regression            Run fscap regression tests\n");
> -	fprintf(stderr, "--test-nested-userns                Run nested userns idmapped mount testsuite\n");
> -	fprintf(stderr, "--test-btrfs                        Run btrfs specific idmapped mount testsuite\n");
> -	fprintf(stderr, "--test-tmpfs                        Run tmpfs specific idmapped mount testsuite\n");
> +	fprintf(stderr, "--device			     Device used in the tests\n");
> +	fprintf(stderr, "--fstype			     Filesystem type used in the tests\n");
> +	fprintf(stderr, "--help				     Print help\n");
> +	fprintf(stderr, "--mountpoint			     Mountpoint of device\n");
> +	fprintf(stderr, "--idmapped-mounts-supported	     Test whether idmapped mounts are supported on this filesystem\n");
> +	fprintf(stderr, "--scratch-mountpoint		     Mountpoint of scratch device used in the tests\n");
> +	fprintf(stderr, "--scratch-device		     Scratch device used in the tests\n");
> +	fprintf(stderr, "--test-core			     Run core idmapped mount testsuite\n");
> +	fprintf(stderr, "--test-fscaps-regression	     Run fscap regression tests\n");
> +	fprintf(stderr, "--test-nested-userns		     Run nested userns idmapped mount testsuite\n");
> +	fprintf(stderr, "--test-btrfs			     Run btrfs specific idmapped mount testsuite\n");
> +	fprintf(stderr, "--test-tmpfs			     Run tmpfs specific idmapped mount testsuite\n");
>  	fprintf(stderr, "--test-setattr-fix-968219708108     Run setattr regression tests\n");
>  	fprintf(stderr, "--test-setxattr-fix-705191b03d50    Run setxattr regression tests\n");
> -	fprintf(stderr, "--test-setgid-create-umask          Run setgid with umask tests\n");
> -	fprintf(stderr, "--test-setgid-create-acl            Run setgid with acl tests\n");
> +	fprintf(stderr, "--test-setgid-create-umask	     Run setgid with umask tests\n");
> +	fprintf(stderr, "--test-setgid-create-acl	     Run setgid with acl tests\n");
>  
>  	_exit(EXIT_SUCCESS);
>  }
> -- 
> 2.39.2
>

Rodrigo Campos March 7, 2023, 5:10 p.m. UTC | #2

On 3/7/23 17:55, Christian Brauner wrote:
> On Tue, Mar 07, 2023 at 12:45:07PM +0100, Rodrigo Campos wrote:
>> Signed-off-by: Rodrigo Campos <rodrigo@sdfg.com.ar>
>> ---
> 
> I think I explicitly used spaces but I don't know why anymore tbh. So
> I'll live that to Zorro whether he wants to take this patch or not. I
> have no strong opinion. :)

Right, it seems my patch also changed spacing after sprintf, for the 
printed text.

I'll remove that and just keep this in the diff:

>> diff --git src/vfs/vfstest.c src/vfs/vfstest.c
>> index 3d75b1e3..dea344cc 100644
>> --- src/vfs/vfstest.c
>> +++ src/vfs/vfstest.c
>> @@ -107,7 +107,7 @@ static int hardlink_crossing_mounts(const struct vfstest_info *info)
>>   	int fret = -1;
>>   	int file1_fd = -EBADF, open_tree_fd = -EBADF;
>>   
>> -        if (chown_r(info->t_mnt_fd, T_DIR1, 10000, 10000)) {
>> +	if (chown_r(info->t_mnt_fd, T_DIR1, 10000, 10000)) {
>>   		log_stderr("failure: chown_r");
>>   		goto out;
>>   	}

Zorro Lang March 8, 2023, 5:27 p.m. UTC | #3

On Tue, Mar 07, 2023 at 05:55:08PM +0100, Christian Brauner wrote:
> On Tue, Mar 07, 2023 at 12:45:07PM +0100, Rodrigo Campos wrote:
> > Signed-off-by: Rodrigo Campos <rodrigo@sdfg.com.ar>
> > ---
> 
> I think I explicitly used spaces but I don't know why anymore tbh. So
> I'll live that to Zorro whether he wants to take this patch or not. I
> have no strong opinion. :)

Thanks Christian, I prefer 8 character tabs generally, I recommend that
but it's not mandatory.

If I have to say a restriction, "please use/keep using same indentation
format in a same sub-case or sub-project (e.g. src/vfs/*, ltp/fsstress.c)"

Anyway, I don't think we need to use a single patch to change code indentation
only (except it's a big mess:). Better to pay attention to it in regular case
writting and reviewing.

Thanks,
Zorro

> 
> >  src/vfs/vfstest.c | 30 +++++++++++++++---------------
> >  1 file changed, 15 insertions(+), 15 deletions(-)
> > 
> > diff --git src/vfs/vfstest.c src/vfs/vfstest.c
> > index 3d75b1e3..dea344cc 100644
> > --- src/vfs/vfstest.c
> > +++ src/vfs/vfstest.c
> > @@ -107,7 +107,7 @@ static int hardlink_crossing_mounts(const struct vfstest_info *info)
> >  	int fret = -1;
> >  	int file1_fd = -EBADF, open_tree_fd = -EBADF;
> >  
> > -        if (chown_r(info->t_mnt_fd, T_DIR1, 10000, 10000)) {
> > +	if (chown_r(info->t_mnt_fd, T_DIR1, 10000, 10000)) {
> >  		log_stderr("failure: chown_r");
> >  		goto out;
> >  	}
> > @@ -2307,22 +2307,22 @@ static void usage(void)
> >  	fprintf(stderr, "    Run idmapped mount tests\n\n");
> >  
> >  	fprintf(stderr, "Arguments:\n");
> > -	fprintf(stderr, "--device                            Device used in the tests\n");
> > -	fprintf(stderr, "--fstype                            Filesystem type used in the tests\n");
> > -	fprintf(stderr, "--help                              Print help\n");
> > -	fprintf(stderr, "--mountpoint                        Mountpoint of device\n");
> > -	fprintf(stderr, "--idmapped-mounts-supported         Test whether idmapped mounts are supported on this filesystem\n");
> > -	fprintf(stderr, "--scratch-mountpoint                Mountpoint of scratch device used in the tests\n");
> > -	fprintf(stderr, "--scratch-device                    Scratch device used in the tests\n");
> > -	fprintf(stderr, "--test-core                         Run core idmapped mount testsuite\n");
> > -	fprintf(stderr, "--test-fscaps-regression            Run fscap regression tests\n");
> > -	fprintf(stderr, "--test-nested-userns                Run nested userns idmapped mount testsuite\n");
> > -	fprintf(stderr, "--test-btrfs                        Run btrfs specific idmapped mount testsuite\n");
> > -	fprintf(stderr, "--test-tmpfs                        Run tmpfs specific idmapped mount testsuite\n");
> > +	fprintf(stderr, "--device			     Device used in the tests\n");
> > +	fprintf(stderr, "--fstype			     Filesystem type used in the tests\n");
> > +	fprintf(stderr, "--help				     Print help\n");
> > +	fprintf(stderr, "--mountpoint			     Mountpoint of device\n");
> > +	fprintf(stderr, "--idmapped-mounts-supported	     Test whether idmapped mounts are supported on this filesystem\n");
> > +	fprintf(stderr, "--scratch-mountpoint		     Mountpoint of scratch device used in the tests\n");
> > +	fprintf(stderr, "--scratch-device		     Scratch device used in the tests\n");
> > +	fprintf(stderr, "--test-core			     Run core idmapped mount testsuite\n");
> > +	fprintf(stderr, "--test-fscaps-regression	     Run fscap regression tests\n");
> > +	fprintf(stderr, "--test-nested-userns		     Run nested userns idmapped mount testsuite\n");
> > +	fprintf(stderr, "--test-btrfs			     Run btrfs specific idmapped mount testsuite\n");
> > +	fprintf(stderr, "--test-tmpfs			     Run tmpfs specific idmapped mount testsuite\n");
> >  	fprintf(stderr, "--test-setattr-fix-968219708108     Run setattr regression tests\n");
> >  	fprintf(stderr, "--test-setxattr-fix-705191b03d50    Run setxattr regression tests\n");
> > -	fprintf(stderr, "--test-setgid-create-umask          Run setgid with umask tests\n");
> > -	fprintf(stderr, "--test-setgid-create-acl            Run setgid with acl tests\n");
> > +	fprintf(stderr, "--test-setgid-create-umask	     Run setgid with umask tests\n");
> > +	fprintf(stderr, "--test-setgid-create-acl	     Run setgid with acl tests\n");
> >  
> >  	_exit(EXIT_SUCCESS);
> >  }
> > -- 
> > 2.39.2
> > 
>

diff --git src/vfs/vfstest.c src/vfs/vfstest.c
index 3d75b1e3..dea344cc 100644
--- src/vfs/vfstest.c
+++ src/vfs/vfstest.c
@@ -107,7 +107,7 @@  static int hardlink_crossing_mounts(const struct vfstest_info *info)
 	int fret = -1;
 	int file1_fd = -EBADF, open_tree_fd = -EBADF;
 
-        if (chown_r(info->t_mnt_fd, T_DIR1, 10000, 10000)) {
+	if (chown_r(info->t_mnt_fd, T_DIR1, 10000, 10000)) {
 		log_stderr("failure: chown_r");
 		goto out;
 	}
@@ -2307,22 +2307,22 @@  static void usage(void)
 	fprintf(stderr, "    Run idmapped mount tests\n\n");
 
 	fprintf(stderr, "Arguments:\n");
-	fprintf(stderr, "--device                            Device used in the tests\n");
-	fprintf(stderr, "--fstype                            Filesystem type used in the tests\n");
-	fprintf(stderr, "--help                              Print help\n");
-	fprintf(stderr, "--mountpoint                        Mountpoint of device\n");
-	fprintf(stderr, "--idmapped-mounts-supported         Test whether idmapped mounts are supported on this filesystem\n");
-	fprintf(stderr, "--scratch-mountpoint                Mountpoint of scratch device used in the tests\n");
-	fprintf(stderr, "--scratch-device                    Scratch device used in the tests\n");
-	fprintf(stderr, "--test-core                         Run core idmapped mount testsuite\n");
-	fprintf(stderr, "--test-fscaps-regression            Run fscap regression tests\n");
-	fprintf(stderr, "--test-nested-userns                Run nested userns idmapped mount testsuite\n");
-	fprintf(stderr, "--test-btrfs                        Run btrfs specific idmapped mount testsuite\n");
-	fprintf(stderr, "--test-tmpfs                        Run tmpfs specific idmapped mount testsuite\n");
+	fprintf(stderr, "--device			     Device used in the tests\n");
+	fprintf(stderr, "--fstype			     Filesystem type used in the tests\n");
+	fprintf(stderr, "--help				     Print help\n");
+	fprintf(stderr, "--mountpoint			     Mountpoint of device\n");
+	fprintf(stderr, "--idmapped-mounts-supported	     Test whether idmapped mounts are supported on this filesystem\n");
+	fprintf(stderr, "--scratch-mountpoint		     Mountpoint of scratch device used in the tests\n");
+	fprintf(stderr, "--scratch-device		     Scratch device used in the tests\n");
+	fprintf(stderr, "--test-core			     Run core idmapped mount testsuite\n");
+	fprintf(stderr, "--test-fscaps-regression	     Run fscap regression tests\n");
+	fprintf(stderr, "--test-nested-userns		     Run nested userns idmapped mount testsuite\n");
+	fprintf(stderr, "--test-btrfs			     Run btrfs specific idmapped mount testsuite\n");
+	fprintf(stderr, "--test-tmpfs			     Run tmpfs specific idmapped mount testsuite\n");
 	fprintf(stderr, "--test-setattr-fix-968219708108     Run setattr regression tests\n");
 	fprintf(stderr, "--test-setxattr-fix-705191b03d50    Run setxattr regression tests\n");
-	fprintf(stderr, "--test-setgid-create-umask          Run setgid with umask tests\n");
-	fprintf(stderr, "--test-setgid-create-acl            Run setgid with acl tests\n");
+	fprintf(stderr, "--test-setgid-create-umask	     Run setgid with umask tests\n");
+	fprintf(stderr, "--test-setgid-create-acl	     Run setgid with acl tests\n");
 
 	_exit(EXIT_SUCCESS);
 }

[11/11] vfs: Use tabs to indent, not spaces

Commit Message

Comments

Patch