From: Mike Marciniszyn <mike.marciniszyn@intel.com>
Date: Fri, 2 Feb 2018 16:45:53 +0000 (-0800)
Subject: LU-10560 llite: remove extra headers from llite_mmap.c
X-Git-Tag: 2.10.4-RC1~29
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8e718fde2f35312c624828c375462bddf67854a3;p=fs%2Flustre-release.git

LU-10560 llite: remove extra headers from llite_mmap.c

Remove headers from llite_mmap.c that are no longer (or were possibly
never) needed.  This avoids a compile problem with 4.14 kernels:

	CC [M]  lustre/llite/llite_mmap.o
	In file included from lustre/llite/llite_mmap.c:41:0:
	./arch/x86/include/asm/uaccess.h: In function ‘set_fs’:
	./arch/x86/include/asm/uaccess.h:31:9:
		error: dereferencing pointer to incomplete type
		current->thread.addr_limit = fs;

It turns out <asm/uaccess.h> was included twice but we don't need
anything from that header.  Same for <linux/stat.h> and a number of
other extraneous headers.

Sort headers alphabetically so it is easier to avoid duplicates.

Lustre-change: https://review.whamcloud.com/31150
Lustre-commit: aae9a90ce7c967c208c482e0ef500c5115017388

Test-Parameters: trivial
Change-Id: Ic24a58bdaec16f92d7bea9c24172796031cad471
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/31924
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
---

diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index e76f3e4..0fff9b9 100644
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -30,20 +30,10 @@
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/unistd.h>
-#include <linux/version.h>
-#include <asm/uaccess.h>
-
-#include <linux/fs.h>
-#include <linux/stat.h>
-#include <asm/uaccess.h>
+#include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/pagemap.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE