[CRIU] [PATCH 1/5] vma: Clamp union with single element

Pavel Emelyanov xemul at virtuozzo.com
Fri Feb 10 03:32:52 PST 2017


Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 criu/include/vma.h | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/criu/include/vma.h b/criu/include/vma.h
index f6df707..37f8b4b 100644
--- a/criu/include/vma.h
+++ b/criu/include/vma.h
@@ -36,17 +36,7 @@ struct vma_area {
 
 	union {
 		struct /* for dump */ {
-			union {
-				/*
-				 * These two cannot be assigned at once.
-				 * The file_fd is an fd for a regular file and
-				 * the socket_id is the inode number of the
-				 * mapped (PF_PACKET) socket.
-				 *
-				 * The aio_nr_req is only for aio rings.
-				 */
-				int	vm_socket_id;
-			};
+			int		vm_socket_id;
 
 			char		*aufs_rpath;	/* path from aufs root */
 			char		*aufs_fpath;	/* full path from global root */
-- 
2.5.0



More information about the CRIU mailing list