From 542ca1ef3deeed7dc646bd3ddbb149c55cb6f369 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Wed, 3 Dec 2014 21:09:26 +0000
Subject: [PATCH] Move umount2 parser to a separate file

* umount.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* system.c: Move sys_umount2 and related code to umount.c.
---
 Makefile.am |  1 +
 system.c    | 17 -----------------
 umount.c    | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 umount.c

diff --git a/Makefile.am b/Makefile.am
index 707f4860..e6dff3ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,7 @@ strace_SOURCES =	\
 	system.c	\
 	term.c		\
 	time.c		\
+	umount.c	\
 	util.c		\
 	v4l2.c		\
 	vsprintf.c
diff --git a/system.c b/system.c
index 91a471bc..fe07cf57 100644
--- a/system.c
+++ b/system.c
@@ -100,20 +100,3 @@ sys_mount(struct tcb *tcp)
 	}
 	return 0;
 }
-
-#define MNT_FORCE	0x00000001	/* Attempt to forcibily umount */
-#define MNT_DETACH	0x00000002	/* Just detach from the tree */
-#define MNT_EXPIRE	0x00000004	/* Mark for expiry */
-
-#include "xlat/umount_flags.h"
-
-int
-sys_umount2(struct tcb *tcp)
-{
-	if (entering(tcp)) {
-		printstr(tcp, tcp->u_arg[0], -1);
-		tprints(", ");
-		printflags(umount_flags, tcp->u_arg[1], "MNT_???");
-	}
-	return 0;
-}
diff --git a/umount.c b/umount.c
new file mode 100644
index 00000000..ca5037f5
--- /dev/null
+++ b/umount.c
@@ -0,0 +1,18 @@
+#include "defs.h"
+
+#define MNT_FORCE	0x00000001	/* Attempt to forcibily umount */
+#define MNT_DETACH	0x00000002	/* Just detach from the tree */
+#define MNT_EXPIRE	0x00000004	/* Mark for expiry */
+
+#include "xlat/umount_flags.h"
+
+int
+sys_umount2(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printstr(tcp, tcp->u_arg[0], -1);
+		tprints(", ");
+		printflags(umount_flags, tcp->u_arg[1], "MNT_???");
+	}
+	return 0;
+}
-- 
2.40.0