Patchwork e2fsprogs: fix flag settings in e2image.h

login
register
mail settings
Submitter Tomas Racek
Date Feb. 21, 2013, 12:06 p.m.
Message ID <1361448418-26688-1-git-send-email-tracek@redhat.com>
Download mbox | patch
Permalink /patch/222270/
State Accepted
Headers show

Comments

Tomas Racek - Feb. 21, 2013, 12:06 p.m.
This prevents from SIGSEGV when -s options is used.

Signed-off-by: Tomas Racek <tracek@redhat.com>
---
 lib/ext2fs/e2image.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Lukas Czerner - Feb. 21, 2013, 1 p.m.
On Thu, 21 Feb 2013, Tomas Racek wrote:

> Date: Thu, 21 Feb 2013 13:06:58 +0100
> From: Tomas Racek <tracek@redhat.com>
> To: linux-ext4@vger.kernel.org
> Cc: Tomas Racek <tracek@redhat.com>
> Subject: [PATCH] e2fsprogs: fix flag settings in e2image.h
> 
> This prevents from SIGSEGV when -s options is used.

oops! Thanks for catching that. I just wonder why the regression
test is not catching that ?


you can add

Reviewed-by: Lukas Czerner <lczerner@redhat.com>

> 
> Signed-off-by: Tomas Racek <tracek@redhat.com>
> ---
>  lib/ext2fs/e2image.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/ext2fs/e2image.h b/lib/ext2fs/e2image.h
> index c918529..5537980 100644
> --- a/lib/ext2fs/e2image.h
> +++ b/lib/ext2fs/e2image.h
> @@ -19,7 +19,7 @@
>  /* Image flags */
>  #define E2IMAGE_INSTALL_FLAG	1
>  #define E2IMAGE_SCRAMBLE_FLAG	2
> -#define E2IMAGE_IS_QCOW2_FLAG	3
> +#define E2IMAGE_IS_QCOW2_FLAG	4
>  
>  struct ext2_image_hdr {
>  	__u32	magic_number;	/* This must be EXT2_ET_MAGIC_E2IMAGE */
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tomas Racek - Feb. 28, 2013, 8:11 p.m.
----- Original Message -----
> On Thu, 21 Feb 2013, Tomas Racek wrote:
> 
> > Date: Thu, 21 Feb 2013 13:06:58 +0100
> > From: Tomas Racek <tracek@redhat.com>
> > To: linux-ext4@vger.kernel.org
> > Cc: Tomas Racek <tracek@redhat.com>
> > Subject: [PATCH] e2fsprogs: fix flag settings in e2image.h
> > 
> > This prevents from SIGSEGV when -s options is used.
> 
> oops! Thanks for catching that. I just wonder why the regression
> test is not catching that ?

Well, it seems that "-s" option is not tested (or even used). I'll try to fix at least the first thing. ;-)

Tom

> 
> 
> you can add
> 
> Reviewed-by: Lukas Czerner <lczerner@redhat.com>
> 
> > 
> > Signed-off-by: Tomas Racek <tracek@redhat.com>
> > ---
> >  lib/ext2fs/e2image.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/lib/ext2fs/e2image.h b/lib/ext2fs/e2image.h
> > index c918529..5537980 100644
> > --- a/lib/ext2fs/e2image.h
> > +++ b/lib/ext2fs/e2image.h
> > @@ -19,7 +19,7 @@
> >  /* Image flags */
> >  #define E2IMAGE_INSTALL_FLAG	1
> >  #define E2IMAGE_SCRAMBLE_FLAG	2
> > -#define E2IMAGE_IS_QCOW2_FLAG	3
> > +#define E2IMAGE_IS_QCOW2_FLAG	4
> >  
> >  struct ext2_image_hdr {
> >  	__u32	magic_number;	/* This must be EXT2_ET_MAGIC_E2IMAGE */
> > 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o - April 22, 2013, 3:49 a.m.
On Thu, Feb 21, 2013 at 01:06:58PM +0100, Tomas Racek wrote:
> This prevents from SIGSEGV when -s options is used.
> 
> Signed-off-by: Tomas Racek <tracek@redhat.com>

Applied, thanks.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/lib/ext2fs/e2image.h b/lib/ext2fs/e2image.h
index c918529..5537980 100644
--- a/lib/ext2fs/e2image.h
+++ b/lib/ext2fs/e2image.h
@@ -19,7 +19,7 @@ 
 /* Image flags */
 #define E2IMAGE_INSTALL_FLAG	1
 #define E2IMAGE_SCRAMBLE_FLAG	2
-#define E2IMAGE_IS_QCOW2_FLAG	3
+#define E2IMAGE_IS_QCOW2_FLAG	4
 
 struct ext2_image_hdr {
 	__u32	magic_number;	/* This must be EXT2_ET_MAGIC_E2IMAGE */