From 2639e47aef9dfa60a9003841d1fe771f1acf900a Mon Sep 17 00:00:00 2001
From: Mike Marciniszyn <mike.marciniszyn@intel.com>
Date: Fri, 2 Feb 2018 08:45:54 -0800
Subject: [PATCH] LU-10560 llite: remove extra headers from rw26.c
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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/rw26.o
	In file included from lustre/llite/rw26.c:43: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/31151
Lustre-commit: b8e87b5a1c17048a760ce9809fde904ca6dc449d

Change-Id: I4cbe2c1c7289466396b2bb2eac3c475d1041a283
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/31925
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
---
 lustre/llite/rw26.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index ec2bf6c..528f289 100644
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -34,27 +34,22 @@
  * Lustre Lite I/O page cache routines for the 2.5/2.6 kernel version
  */
 
+#include <linux/buffer_head.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/mpage.h>
+#include <linux/pagemap.h>
 #include <linux/string.h>
-#include <linux/stat.h>
-#include <linux/errno.h>
 #include <linux/unistd.h>
-#include <asm/uaccess.h>
+#include <linux/writeback.h>
 
 #ifdef HAVE_MIGRATE_H
 #include <linux/migrate.h>
 #elif defined(HAVE_MIGRATE_MODE_H)
 #include <linux/migrate_mode.h>
 #endif
-#include <linux/fs.h>
-#include <linux/buffer_head.h>
-#include <linux/mpage.h>
-#include <linux/writeback.h>
-#include <linux/stat.h>
-#include <asm/uaccess.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-- 
1.8.3.1