From 9c2aadd0fdf88a7ebeebd1e97a9c66b07ad3e14a Mon Sep 17 00:00:00 2001

From: Kari Argillander <kari.argillander@gmail.com>

Date: Thu, 2 Sep 2021 19:15:28 +0300

Subject: [Backport 9c2aadd0fdf8] src: Remove unneeded header files from c

 files

We have lot of unnecessary headers in these files. Remove them so that

we help compiler a little bit.

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/attrib.c   | 5 -----

 src/attrlist.c | 3 ---

 src/bitmap.c   | 3 ---

 src/dir.c      | 3 ---

 src/file.c     | 1 -

 src/frecord.c  | 3 ---

 src/fslog.c    | 4 ----

 src/fsntfs.c   | 1 -

 src/index.c    | 1 -

 src/inode.c    | 2 --

 src/namei.c    | 4 ----

 src/record.c   | 3 ---

 src/run.c      | 2 --

 src/super.c    | 2 --

 src/xattr.c    | 3 ---

 15 files changed, 40 deletions(-)

diff --git a/src/attrib.c b/src/attrib.c

index b1055b284c60323168be99ce69b18e7dbd7bb969..12cff28f3e7155231e56864792dd764487297f37 100644

--- a/src/attrib.c

+++ b/src/attrib.c

@@ -6,12 +6,7 @@

  * TODO: Merge attr_set_size/attr_data_get_block/attr_allocate_frame?

  */

-#include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/hash.h>

-#include <linux/nls.h>

-#include <linux/ratelimit.h>

 #include <linux/slab.h>

 #include "debug.h"

diff --git a/src/attrlist.c b/src/attrlist.c

index fa32399eb5171ce25f037fbd1bd8e483a37b839c..b9da527b96aa2ab00bf43d439d8527b587946a9d 100644

--- a/src/attrlist.c

+++ b/src/attrlist.c

@@ -5,10 +5,7 @@

  *

  */

-#include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/nls.h>

 #include "debug.h"

 #include "ntfs.h"

diff --git a/src/bitmap.c b/src/bitmap.c

index 831501555009533d8b3eac04b6258e7072bd6304..a03584674fea13c818f341f8f2a5147957507709 100644

--- a/src/bitmap.c

+++ b/src/bitmap.c

@@ -10,12 +10,9 @@

  *

  */

-#include <linux/blkdev.h>

 #include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/nls.h>

-#include "debug.h"

 #include "ntfs.h"

 #include "ntfs_fs.h"

diff --git a/src/dir.c b/src/dir.c

index 40440df021eff2a95a87ff7a2af38345a7c40793..785e72d4392e152ef6833721e887ed9ef056094b 100644

--- a/src/dir.c

+++ b/src/dir.c

@@ -7,10 +7,7 @@

  *

  */

-#include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/iversion.h>

 #include <linux/nls.h>

 #include "debug.h"

diff --git a/src/file.c b/src/file.c

index 0743d806c567409dd2845b6577f2ae3adf92b383..5fb3508e5422cc6654381897d6fdb4a204a543a4 100644

--- a/src/file.c

+++ b/src/file.c

@@ -12,7 +12,6 @@

 #include <linux/compat.h>

 #include <linux/falloc.h>

 #include <linux/fiemap.h>

-#include <linux/nls.h>

 #include "debug.h"

 #include "ntfs.h"

diff --git a/src/frecord.c b/src/frecord.c

index 938b12d56ca676308d2af82666a4f6f19cc8f122..080264ced9090a61825dbe00d96458c76538468b 100644

--- a/src/frecord.c

+++ b/src/frecord.c

@@ -5,11 +5,8 @@

  *

  */

-#include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fiemap.h>

 #include <linux/fs.h>

-#include <linux/nls.h>

 #include <linux/vmalloc.h>

 #include "debug.h"

diff --git a/src/fslog.c b/src/fslog.c

index b5853aed0e25bc6d93b3f6f667ae36feda3d980b..6e7f9b72792b354a6e588b506c7352b286ed58bd 100644

--- a/src/fslog.c

+++ b/src/fslog.c

@@ -6,12 +6,8 @@

  */

 #include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/hash.h>

-#include <linux/nls.h>

 #include <linux/random.h>

-#include <linux/ratelimit.h>

 #include <linux/slab.h>

 #include "debug.h"

diff --git a/src/fsntfs.c b/src/fsntfs.c

index 91e3743e1442f10cfc727eba0587a9ef0b20c039..9232a7f410c68bb0b1f3a5cedd2295b814372404 100644

--- a/src/fsntfs.c

+++ b/src/fsntfs.c

@@ -8,7 +8,6 @@

 #include <linux/blkdev.h>

 #include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/nls.h>

 #include "debug.h"

 #include "ntfs.h"

diff --git a/src/index.c b/src/index.c

index b1175542d854c44550858ce7620df68b99ee7b86..35b77c92e96dc661baac0cc1ecaa3d0f130ef8e6 100644

--- a/src/index.c

+++ b/src/index.c

@@ -8,7 +8,6 @@

 #include <linux/blkdev.h>

 #include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/nls.h>

 #include "debug.h"

 #include "ntfs.h"

diff --git a/src/inode.c b/src/inode.c

index 9f740fd301b24f2b1a67da0b78d091b3a3ae4705..33f278a0947ca23e103683b9daece8f539da355b 100644

--- a/src/inode.c

+++ b/src/inode.c

@@ -5,10 +5,8 @@

  *

  */

-#include <linux/blkdev.h>

 #include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/iversion.h>

 #include <linux/mpage.h>

 #include <linux/namei.h>

 #include <linux/nls.h>

diff --git a/src/namei.c b/src/namei.c

index e58415d0713280297df1b7bac30eb17642431fa0..1c475da4e19d1158e3c11fcb749fb0825d2d7ae6 100644

--- a/src/namei.c

+++ b/src/namei.c

@@ -5,11 +5,7 @@

  *

  */

-#include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/iversion.h>

-#include <linux/namei.h>

 #include <linux/nls.h>

 #include "debug.h"

diff --git a/src/record.c b/src/record.c

index 103705c86772f45a90227e6434449e99c4d7d94b..861e35791506e801dc446414d935d5463e64a1fb 100644

--- a/src/record.c

+++ b/src/record.c

@@ -5,10 +5,7 @@

  *

  */

-#include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/nls.h>

 #include "debug.h"

 #include "ntfs.h"

diff --git a/src/run.c b/src/run.c

index 26ed2b64345e665a39c6b37d88b29c5b81592ecd..a8fec651f9732878ad871cc476d8a6fcf28f9312 100644

--- a/src/run.c

+++ b/src/run.c

@@ -7,10 +7,8 @@

  */

 #include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fs.h>

 #include <linux/log2.h>

-#include <linux/nls.h>

 #include "debug.h"

 #include "ntfs.h"

diff --git a/src/super.c b/src/super.c

index 3cba0b5e7ac72c444a55de38b791faa87732049f..acfa00acf4dd1c94ebfc63a47270a86570e0073e 100644

--- a/src/super.c

+++ b/src/super.c

@@ -23,14 +23,12 @@

  *

  */

-#include <linux/backing-dev.h>

 #include <linux/blkdev.h>

 #include <linux/buffer_head.h>

 #include <linux/exportfs.h>

 #include <linux/fs.h>

 #include <linux/fs_context.h>

 #include <linux/fs_parser.h>

-#include <linux/iversion.h>

 #include <linux/log2.h>

 #include <linux/module.h>

 #include <linux/nls.h>

diff --git a/src/xattr.c b/src/xattr.c

index 6f88cb77a17f666fc7cdcdcdcd44b032ceca1c07..a8c5a899f0dd308fe5014bf3b384bc903ca0bf68 100644

--- a/src/xattr.c

+++ b/src/xattr.c

@@ -5,10 +5,7 @@

  *

  */

-#include <linux/blkdev.h>

-#include <linux/buffer_head.h>

 #include <linux/fs.h>

-#include <linux/nls.h>

 #include <linux/posix_acl.h>

 #include <linux/posix_acl_xattr.h>

 #include <linux/xattr.h>

-- 

2.31.1