[PATCH] Fix atari label false positives

[PATCH] Fix atari label false positives

[Phillip Susi]

The atari label gets false positives easily, so probe it after
all other labels have said no.
---
 NEWS                  | 2 ++
 libparted/libparted.c | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 2c903ca5..a5ec44ee 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ GNU parted NEWS                                    -*- outline -*-
 
 ** Bug Fixes
 
+  Fix atari disklabel false positives by probing other labels first.
+
   Fix set and disk_set to not crash when there are no flags to set.
 
   Fix resizepart to adjust the end to be -1 sector when using iec
diff --git a/libparted/libparted.c b/libparted/libparted.c
index d855d0e6..e864d1b3 100644
--- a/libparted/libparted.c
+++ b/libparted/libparted.c
@@ -85,7 +85,7 @@ init_disk_types ()
 #if defined __s390__ || defined __s390x__
 	ped_disk_dasd_init();
 #endif
-
+	ped_disk_atari_init ();
 	ped_disk_sun_init ();
 #ifdef ENABLE_PC98
 	ped_disk_pc98_init ();
@@ -97,7 +97,6 @@ init_disk_types ()
 	ped_disk_bsd_init ();
 	ped_disk_amiga_init ();
 	ped_disk_aix_init ();
-	ped_disk_atari_init ();
 }
 
 extern void ped_file_system_amiga_init (void);
-- 
2.17.0

Re: [PATCH] Fix atari label false positives

[John Paul Adrian Glaubitz]

On 06/05/2018 04:30 PM, Phillip Susi wrote:
> diff --git a/libparted/libparted.c b/libparted/libparted.c
> index d855d0e6..e864d1b3 100644
> --- a/libparted/libparted.c
> +++ b/libparted/libparted.c
> @@ -85,7 +85,7 @@ init_disk_types ()
>  #if defined __s390__ || defined __s390x__
>  	ped_disk_dasd_init();
>  #endif
> -
> +	ped_disk_atari_init ();
>  	ped_disk_sun_init ();
>  #ifdef ENABLE_PC98
>  	ped_disk_pc98_init ();
> @@ -97,7 +97,6 @@ init_disk_types ()
>  	ped_disk_bsd_init ();
>  	ped_disk_amiga_init ();
>  	ped_disk_aix_init ();
> -	ped_disk_atari_init ();
>  }

Is that the reversed patch? I thought you wanted to move the atari
probing to the bottom?

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz-8fiUuRrzOP0dnm+yROfE0A@public.gmane.org
`. `'   Freie Universitaet Berlin - glaubitz-1Olz3AKvcsuAKZTfuerNgRvVK+yQ3ZXh@public.gmane.org
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH] Fix atari label false positives

[Phillip Susi]

[-- Attachment #1.1: Type: text/plain, Size: 359 bytes --]

On 6/5/2018 10:35 AM, John Paul Adrian Glaubitz wrote:
> Is that the reversed patch? I thought you wanted to move the atari
> probing to the bottom?

No; the order they are probed in is the reverse of the order they are
initialized in because the fs registration puts the new one on the head
and slides the previously registered ones further down.



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] Fix atari label false positives

[John Paul Adrian Glaubitz]

On 06/05/2018 04:40 PM, Phillip Susi wrote:
> On 6/5/2018 10:35 AM, John Paul Adrian Glaubitz wrote:
>> Is that the reversed patch? I thought you wanted to move the atari
>> probing to the bottom?
> 
> No; the order they are probed in is the reverse of the order they are
> initialized in because the fs registration puts the new one on the head
> and slides the previously registered ones further down.

I see, thanks for the explanation.

I hope that I can fix the partition atari detection code sometime in the
future. I need to have a look at the partition probing code in the Linux
kernel where it works without false positives.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz-8fiUuRrzOP0dnm+yROfE0A@public.gmane.org
`. `'   Freie Universitaet Berlin - glaubitz-1Olz3AKvcsuAKZTfuerNgRvVK+yQ3ZXh@public.gmane.org
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH] Fix atari label false positives

[Håkon Løvdal]

While the commit message contains the relevant information, this really
ought to be present as a comment directly in the code as well. And
the un-obviousness of the code vs check order deserves a mention as
well, so please add a commen like

+       ped_disk_atari_init (); // NB! Must be first so that it is checked last.

Re: [PATCH] Fix atari label false positives

[Phillip Susi]

[-- Attachment #1.1: Type: text/plain, Size: 399 bytes --]

On 6/5/2018 4:08 PM, Håkon Løvdal wrote:
> While the commit message contains the relevant information, this really
> ought to be present as a comment directly in the code as well. And
> the un-obviousness of the code vs check order deserves a mention as
> well, so please add a commen like
> 
> +       ped_disk_atari_init (); // NB! Must be first so that it is checked last.

Will do.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]