diff mbox series

[5/6] mkfs: remove redundant assignment of cli sb options on failure

Message ID 20200824203724.13477-6-ailiop@suse.com
State New
Headers show
Series xfsprogs: blockdev dax detection and warnings | expand

Commit Message

Anthony Iliopoulos Aug. 24, 2020, 8:37 p.m. UTC
rmapbt and reflink are incompatible with realtime devices and mkfs bails
out on such configurations.  Switching them off in the cli params after
exit is dead code, remove it.

Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
---
 mkfs/xfs_mkfs.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Eric Sandeen Sept. 28, 2020, 9:49 p.m. UTC | #1
On 8/24/20 3:37 PM, Anthony Iliopoulos wrote:
> rmapbt and reflink are incompatible with realtime devices and mkfs bails
> out on such configurations.  Switching them off in the cli params after
> exit is dead code, remove it.
> 
> Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>

I'll go ahead & pull patches 5 & 6 since they're standalone fixes.

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


> ---
>  mkfs/xfs_mkfs.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
> index 75e910dd4a30..1f142f78e677 100644
> --- a/mkfs/xfs_mkfs.c
> +++ b/mkfs/xfs_mkfs.c
> @@ -1995,14 +1995,12 @@ _("cowextsize not supported without reflink support\n"));
>  		fprintf(stderr,
>  _("reflink not supported with realtime devices\n"));
>  		usage();
> -		cli->sb_feat.reflink = false;
>  	}
>  
>  	if (cli->sb_feat.rmapbt && cli->xi->rtname) {
>  		fprintf(stderr,
>  _("rmapbt not supported with realtime devices\n"));
>  		usage();
> -		cli->sb_feat.rmapbt = false;
>  	}
>  
>  	if (cli->sb_feat.reflink && ft->dax) {
>
Eric Sandeen Sept. 28, 2020, 9:56 p.m. UTC | #2
On 9/28/20 4:49 PM, Eric Sandeen wrote:
> On 8/24/20 3:37 PM, Anthony Iliopoulos wrote:
>> rmapbt and reflink are incompatible with realtime devices and mkfs bails
>> out on such configurations.  Switching them off in the cli params after
>> exit is dead code, remove it.
>>
>> Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
> 
> I'll go ahead & pull patches 5 & 6 since they're standalone fixes.
> 
> Reviewed-by: Eric Sandeen <sandeen@redhat.com>

Whoops, Darrick's 

mkfs: fix reflink/rmap logic w.r.t. realtime devices and crc=0 support

already fixed this and a bit more, sorry for the noise.
diff mbox series

Patch

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 75e910dd4a30..1f142f78e677 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1995,14 +1995,12 @@  _("cowextsize not supported without reflink support\n"));
 		fprintf(stderr,
 _("reflink not supported with realtime devices\n"));
 		usage();
-		cli->sb_feat.reflink = false;
 	}
 
 	if (cli->sb_feat.rmapbt && cli->xi->rtname) {
 		fprintf(stderr,
 _("rmapbt not supported with realtime devices\n"));
 		usage();
-		cli->sb_feat.rmapbt = false;
 	}
 
 	if (cli->sb_feat.reflink && ft->dax) {