[CRIU] [PATCH 2/7] mount: Reorder declarations

[Cyrill Gorcunov]

 - gather structs on top
 - then extern vars

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 include/mount.h | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/include/mount.h b/include/mount.h
index 01da3f55fc70..a7fa93821b4c 100644
--- a/include/mount.h
+++ b/include/mount.h
@@ -1,43 +1,42 @@
 #ifndef __CR_MOUNT_H__
 #define __CR_MOUNT_H__
 
+struct proc_mountinfo;
+struct pstree_item;
+struct mount_info;
+struct cr_imgset;
+struct ns_id;
+
 extern struct mount_info *mntinfo;
+extern struct ns_desc mnt_ns_desc;
 
-struct ns_id;
 extern int __mntns_get_root_fd(pid_t pid);
 extern int mntns_get_root_fd(struct ns_id *ns);
 extern int mntns_get_root_by_mnt_id(int mnt_id);
 extern struct ns_id *lookup_nsid_by_mnt_id(int mnt_id);
 
-struct proc_mountinfo;
-
 extern int open_mount(unsigned int s_dev);
 extern struct fstype *find_fstype_by_name(char *fst);
 extern bool add_fsname_auto(const char *names);
 
-struct cr_imgset;
-extern struct mount_info * collect_mntinfo(struct ns_id *ns, bool for_dump);
+extern struct mount_info *collect_mntinfo(struct ns_id *ns, bool for_dump);
 extern int prepare_mnt_ns(void);
 
 extern int pivot_root(const char *new_root, const char *put_old);
 
-struct mount_info;
-struct mount_info *lookup_overlayfs(char *rpath, unsigned int s_dev,
-				unsigned int st_ino, unsigned int mnt_id);
+extern struct mount_info *lookup_overlayfs(char *rpath, unsigned int s_dev,
+					   unsigned int st_ino, unsigned int mnt_id);
 extern struct mount_info *lookup_mnt_id(unsigned int id);
 extern struct mount_info *lookup_mnt_sdev(unsigned int s_dev);
 
-extern struct ns_desc mnt_ns_desc;
-
 extern dev_t phys_stat_resolve_dev(struct ns_id *, dev_t st_dev, const char *path);
 extern bool phys_stat_dev_match(dev_t st_dev, dev_t phys_dev,
-		struct ns_id *, const char *path);
+				struct ns_id *, const char *path);
 
-struct pstree_item;
-extern int restore_task_mnt_ns(struct pstree_item *);
+extern int restore_task_mnt_ns(struct pstree_item *current);
 extern int fini_mnt_ns(void);
 
-char *rst_get_mnt_root(int mnt_id);
-int ext_mount_add(char *key, char *val);
+extern char *rst_get_mnt_root(int mnt_id);
+extern int ext_mount_add(char *key, char *val);
 
 #endif /* __CR_MOUNT_H__ */
-- 
2.4.3