Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1539873

[PATCH v2 3/5] staging: lustre: headers: sort headers affected by obdo move

Show all headers | View raw

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>
---

Changelog:

v1) Initial patch
v2) rebase patch against newer base patch that now
    includes lustre_obdo.h in osc_request.c.

 drivers/staging/lustre/lustre/osc/osc_request.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 99aefa5..0273ccd 100644
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -34,20 +34,21 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 
-#include "../include/lustre_dlm.h"
-#include "../include/lustre_net.h"
+#include "../include/lustre/lustre_ioctl.h"
 #include "../include/lustre/lustre_user.h"
-#include "../include/obd_cksum.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_dlm.h"
+#include "../include/lustre_fid.h"
+#include "../include/lustre_ha.h"
+#include "../include/lustre_net.h"
 #include "../include/lustre_obdo.h"
 #include "../include/lustre_param.h"
-#include "../include/lustre_fid.h"
-#include "../include/obd_class.h"
 #include "../include/obd.h"
+#include "../include/obd_cksum.h"
+#include "../include/obd_class.h"
+
 #include "osc_internal.h"
 #include "osc_cl_internal.h"
 
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 3/5] staging: lustre: headers: sort headers affected by obdo move James Simmons <jsimmons@infradead.org> - 2016-12-10 19:10 +0100
  Re: [PATCH v2 3/5] staging: lustre: headers: sort headers affected  by obdo move Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-10 19:20 +0100
    Re: [PATCH v2 3/5] staging: lustre: headers: sort headers affected by  obdo move Ben Evans <bevans@cray.com> - 2016-12-12 16:00 +0100
      Re: [PATCH v2 3/5] staging: lustre: headers: sort headers affected  by obdo move Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-12 17:40 +0100
        Re: [PATCH v2 3/5] staging: lustre: headers: sort headers affected  by obdo move Joe Perches <joe@perches.com> - 2016-12-12 19:20 +0100
          Re: [PATCH v2 3/5] staging: lustre: headers: sort headers affected  by obdo move James Simmons <jsimmons@infradead.org> - 2016-12-12 20:50 +0100
            Re: [PATCH v2 3/5] staging: lustre: headers: sort headers affected  by obdo move Joe Perches <joe@perches.com> - 2016-12-12 21:00 +0100
        Re: [PATCH v2 3/5] staging: lustre: headers: sort headers affected by  obdo move Ben Evans <bevans@cray.com> - 2016-12-12 19:30 +0100

csiph-web