lkml.org 
[lkml]   [2016]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/6] staging: lustre: headers: sort headers affected by obdo move
Date
From: Ben Evans <bevans@cray.com>

It was found if you sort the headers alphabetically
that it reduced patch conflicts. This patch sorts
the headers alphabetically and also place linux
header first, then uapi header and finally the
lustre kernel headers.

Signed-off-by: Ben Evans <bevans@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: http://review.whamcloud.com/16917
Reviewed-on: http://review.whamcloud.com/19266
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lustre/osc/osc_request.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 4d4d3eb..f2365b9 100644
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -34,19 +34,20 @@

#include "../../include/linux/libcfs/libcfs.h"

-#include "../include/lustre_dlm.h"
-#include "../include/lustre_net.h"
#include "../include/lustre/lustre_user.h"
-#include "../include/obd_cksum.h"
+#include "../include/lustre/lustre_ioctl.h"

-#include "../include/lustre_ha.h"
#include "../include/lprocfs_status.h"
-#include "../include/lustre/lustre_ioctl.h"
#include "../include/lustre_debug.h"
-#include "../include/lustre_param.h"
#include "../include/lustre_fid.h"
+#include "../include/lustre_ha.h"
+#include "../include/lustre_obdo.h"
+#include "../include/lustre_param.h"
+
+#include "../include/obd_cksum.h"
#include "../include/obd_class.h"
#include "../include/obd.h"
+
#include "osc_internal.h"
#include "osc_cl_internal.h"

--
1.7.1
\
 
 \ /
  Last update: 2016-12-02 20:44    [W:2.399 / U:0.340 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site