tty: Cleanup tty mutex preparation

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-restore.c

@@ -91,6 +91,10 @@ static int prepare_shared(void)
 	if (prepare_shared_fdinfo())
 		return -1;
 
+	if (prepare_shared_tty())
+		return -1;
+
+
 	if (collect_reg_files())
 		return -1;
 
@@ -145,12 +149,8 @@ static int prepare_shared(void)
 		goto err;
 
 	mark_pipe_master();
-	ret = tty_setup_orphan_slavery(&opts);
-	if (ret)
-		goto err;
 
-
-	ret = tty_prepare_shared();
+	ret = tty_setup_orphan_slavery(&opts);
 	if (ret)
 		goto err;
 

include/tty.h

@@ -16,7 +16,7 @@
 extern int dump_tty(struct fd_parms *p, int lfd, const struct cr_fdset *set);
 extern int collect_tty(void);
 extern int tty_is_master(struct fdinfo_list_entry *le);
-extern int tty_prepare_shared(void);
+extern int prepare_shared_tty(void);
 extern int tty_setup_orphan_slavery(const struct cr_options *opts);
 
 #endif /* CR_TTY_H__ */

tty.c

@@ -104,7 +104,7 @@ static DECLARE_BITMAP(tty_bitmap, (MAX_TTYS << 1));
  */
 static mutex_t *tty_mutex;
 
-int tty_prepare_shared(void)
+int prepare_shared_tty(void)
 {
 	tty_mutex = shmalloc(sizeof(*tty_mutex));
 	if (!tty_mutex) {