[03/16] mem/page-pipe: Align members for readability sake

Submitted by Cyrill Gorcunov on July 5, 2019, 3:37 p.m.

Details

Message ID 20190705153811.22652-4-gorcunov@gmail.com
State Accepted
Series "mem: Cleanup and fixups"
Headers show

Commit Message

Cyrill Gorcunov July 5, 2019, 3:37 p.m.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 criu/include/page-pipe.h | 46 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/include/page-pipe.h b/criu/include/page-pipe.h
index 80e595871fba..decd1432123b 100644
--- a/criu/include/page-pipe.h
+++ b/criu/include/page-pipe.h
@@ -91,15 +91,15 @@  struct kernel_pipe_buffer {
  */
 
 struct page_pipe_buf {
-	int p[2];		/* pipe with pages */
-	unsigned int pipe_size;	/* how many pages can be fit into pipe */
-	unsigned int pipe_off;	/* where this buf is started in a pipe */
-	unsigned int pages_in;	/* how many pages are there */
-	unsigned int nr_segs;	/* how many iov-s are busy */
+	int			p[2];		/* pipe with pages */
+	unsigned int		pipe_size;	/* how many pages can be fit into pipe */
+	unsigned int		pipe_off;	/* where this buf is started in a pipe */
+	unsigned int		pages_in;	/* how many pages are there */
+	unsigned int		nr_segs;	/* how many iov-s are busy */
 #define PPB_LAZY (1 << 0)
-	unsigned int flags;
-	struct iovec *iov;	/* vaddr:len map */
-	struct list_head l;	/* links into page_pipe->bufs */
+	unsigned int		flags;
+	struct iovec		*iov;		/* vaddr:len map */
+	struct list_head	l;		/* links into page_pipe->bufs */
 };
 
 /*
@@ -114,21 +114,21 @@  struct page_pipe_buf {
 #define PP_HOLE_PARENT (1 << 0)
 
 struct page_pipe {
-	unsigned int nr_pipes;	/* how many page_pipe_bufs in there */
-	struct list_head bufs;	/* list of bufs */
-	struct list_head free_bufs;	/* list of bufs */
-	struct page_pipe_buf *prev[PP_PIPE_TYPES];	/* last ppb of each type
-							   for pipe sharing */
-	unsigned int nr_iovs;	/* number of iovs */
-	unsigned int free_iov;	/* first free iov */
-	struct iovec *iovs;	/* iovs. They are provided into create_page_pipe
-				   and all bufs have their iov-s in there */
-
-	unsigned int nr_holes;	/* number of holes allocated */
-	unsigned int free_hole;	/* number of holes in use */
-	struct iovec *holes;	/* holes */
-	unsigned int *hole_flags;
-	unsigned flags;		/* PP_FOO flags below */
+	unsigned int		nr_pipes;		/* how many page_pipe_bufs in there */
+	struct list_head	bufs;			/* list of bufs */
+	struct list_head	free_bufs;		/* list of bufs */
+	struct page_pipe_buf	*prev[PP_PIPE_TYPES];	/* last ppb of each type for pipe sharing */
+	unsigned int		nr_iovs;		/* number of iovs */
+	unsigned int		free_iov;		/* first free iov */
+
+	struct iovec		*iovs;			/* iovs. They are provided into create_page_pipe
+							   and all bufs have their iov-s in there */
+
+	unsigned int		nr_holes;		/* number of holes allocated */
+	unsigned int		free_hole;		/* number of holes in use */
+	struct iovec		*holes;			/* holes */
+	unsigned int		*hole_flags;
+	unsigned int		flags;			/* PP_FOO flags below */
 };
 
 #define PP_CHUNK_MODE	0x1	/* Restrict the maximum buffer size of pipes

Comments

Mike Rapoport July 8, 2019, 12:32 p.m.
On Fri, Jul 05, 2019 at 06:37:58PM +0300, Cyrill Gorcunov wrote:
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>

> ---
>  criu/include/page-pipe.h | 46 ++++++++++++++++++++--------------------
>  1 file changed, 23 insertions(+), 23 deletions(-)
> 
> diff --git a/criu/include/page-pipe.h b/criu/include/page-pipe.h
> index 80e595871fba..decd1432123b 100644
> --- a/criu/include/page-pipe.h
> +++ b/criu/include/page-pipe.h
> @@ -91,15 +91,15 @@ struct kernel_pipe_buffer {
>   */
>  
>  struct page_pipe_buf {
> -	int p[2];		/* pipe with pages */
> -	unsigned int pipe_size;	/* how many pages can be fit into pipe */
> -	unsigned int pipe_off;	/* where this buf is started in a pipe */
> -	unsigned int pages_in;	/* how many pages are there */
> -	unsigned int nr_segs;	/* how many iov-s are busy */
> +	int			p[2];		/* pipe with pages */
> +	unsigned int		pipe_size;	/* how many pages can be fit into pipe */
> +	unsigned int		pipe_off;	/* where this buf is started in a pipe */
> +	unsigned int		pages_in;	/* how many pages are there */
> +	unsigned int		nr_segs;	/* how many iov-s are busy */
>  #define PPB_LAZY (1 << 0)
> -	unsigned int flags;
> -	struct iovec *iov;	/* vaddr:len map */
> -	struct list_head l;	/* links into page_pipe->bufs */
> +	unsigned int		flags;
> +	struct iovec		*iov;		/* vaddr:len map */
> +	struct list_head	l;		/* links into page_pipe->bufs */
>  };
>  
>  /*
> @@ -114,21 +114,21 @@ struct page_pipe_buf {
>  #define PP_HOLE_PARENT (1 << 0)
>  
>  struct page_pipe {
> -	unsigned int nr_pipes;	/* how many page_pipe_bufs in there */
> -	struct list_head bufs;	/* list of bufs */
> -	struct list_head free_bufs;	/* list of bufs */
> -	struct page_pipe_buf *prev[PP_PIPE_TYPES];	/* last ppb of each type
> -							   for pipe sharing */
> -	unsigned int nr_iovs;	/* number of iovs */
> -	unsigned int free_iov;	/* first free iov */
> -	struct iovec *iovs;	/* iovs. They are provided into create_page_pipe
> -				   and all bufs have their iov-s in there */
> -
> -	unsigned int nr_holes;	/* number of holes allocated */
> -	unsigned int free_hole;	/* number of holes in use */
> -	struct iovec *holes;	/* holes */
> -	unsigned int *hole_flags;
> -	unsigned flags;		/* PP_FOO flags below */
> +	unsigned int		nr_pipes;		/* how many page_pipe_bufs in there */
> +	struct list_head	bufs;			/* list of bufs */
> +	struct list_head	free_bufs;		/* list of bufs */
> +	struct page_pipe_buf	*prev[PP_PIPE_TYPES];	/* last ppb of each type for pipe sharing */
> +	unsigned int		nr_iovs;		/* number of iovs */
> +	unsigned int		free_iov;		/* first free iov */
> +
> +	struct iovec		*iovs;			/* iovs. They are provided into create_page_pipe
> +							   and all bufs have their iov-s in there */
> +
> +	unsigned int		nr_holes;		/* number of holes allocated */
> +	unsigned int		free_hole;		/* number of holes in use */
> +	struct iovec		*holes;			/* holes */
> +	unsigned int		*hole_flags;
> +	unsigned int		flags;			/* PP_FOO flags below */
>  };
>  
>  #define PP_CHUNK_MODE	0x1	/* Restrict the maximum buffer size of pipes
> -- 
> 2.20.1
> 
> _______________________________________________
> CRIU mailing list
> CRIU@openvz.org
> https://lists.openvz.org/mailman/listinfo/criu
>