From 61de520917bb752dc5aebdc19736cf20f7cc61f0 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 14 Sep 2022 17:06:52 +0200 Subject: [PATCH] btrfs-progs: mkfs: reorder includes The preferred order: - system headers - standard headers - libraries - kernel library - kernel shared - common headers - other tools - own headers Signed-off-by: David Sterba --- mkfs/common.c | 4 ++-- mkfs/main.c | 8 ++++---- mkfs/rootdir.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mkfs/common.c b/mkfs/common.c index 0dfec050..a1255bc3 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -15,10 +15,10 @@ */ #include -#include -#include #include #include +#include +#include #include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/volumes.h" diff --git a/mkfs/main.c b/mkfs/main.c index 38e1b187..1e38d1c4 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -28,9 +28,10 @@ #include #include #include -#include #include +#include #include +#include "kernel-lib/list_sort.h" #include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/free-space-tree.h" @@ -42,16 +43,15 @@ #include "common/path-utils.h" #include "common/device-utils.h" #include "common/device-scan.h" -#include "kernel-lib/list_sort.h" #include "common/help.h" #include "common/rbtree-utils.h" #include "common/parse-utils.h" -#include "mkfs/common.h" -#include "mkfs/rootdir.h" #include "common/fsfeatures.h" #include "common/box.h" #include "common/units.h" #include "check/qgroup-verify.h" +#include "mkfs/common.h" +#include "mkfs/rootdir.h" struct mkfs_allocation { u64 data; diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c index 92be32ea..e6a8bef4 100644 --- a/mkfs/rootdir.c +++ b/mkfs/rootdir.c @@ -28,15 +28,15 @@ #include #include "kernel-shared/ctree.h" #include "kernel-shared/volumes.h" -#include "common/internal.h" #include "kernel-shared/disk-io.h" -#include "common/messages.h" #include "kernel-shared/transaction.h" +#include "common/internal.h" +#include "common/messages.h" #include "common/utils.h" -#include "mkfs/rootdir.h" -#include "mkfs/common.h" #include "common/send-utils.h" #include "common/path-utils.h" +#include "mkfs/rootdir.h" +#include "mkfs/common.h" static u32 fs_block_size;