From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>,
Oleg Drokin <oleg.drokin@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>,
Ben Evans <bevans@cray.com>,
James Simmons <jsimmons@infradead.org>
Subject: [PATCH v2 3/5] staging: lustre: headers: sort headers affected by obdo move
Date: Sat, 10 Dec 2016 13:05:59 -0500 [thread overview]
Message-ID: <1481393161-22623-4-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1481393161-22623-1-git-send-email-jsimmons@infradead.org>
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
next prev parent reply other threads:[~2016-12-10 18:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-10 18:05 [PATCH v2 0/5] Fix ups to make lustre_idl.h a proper UAPI header James Simmons
2016-12-10 18:05 ` [PATCH v2 1/5] staging: lustre: obdclass: Create a header for obdo related functions James Simmons
2016-12-10 18:05 ` [PATCH v2 2/5] staging: lustre: obdclass: style cleanup " James Simmons
2016-12-10 18:05 ` James Simmons [this message]
2016-12-10 18:14 ` [PATCH v2 3/5] staging: lustre: headers: sort headers affected by obdo move Greg Kroah-Hartman
2016-12-12 14:42 ` Ben Evans
2016-12-12 16:34 ` Greg Kroah-Hartman
2016-12-12 18:12 ` Ben Evans
2016-12-12 18:19 ` Joe Perches
2016-12-12 19:41 ` James Simmons
2016-12-12 19:52 ` Joe Perches
2016-12-10 18:06 ` [PATCH v2 4/5] staging: lustre: headers: Move functions out of lustre_idl.h James Simmons
2016-12-10 18:06 ` [PATCH v2 5/5] staging: lustre: headers: use proper byteorder functions in lustre_idl.h James Simmons
2016-12-10 18:16 ` Greg Kroah-Hartman
2016-12-12 20:00 ` James Simmons
2016-12-13 0:37 ` Greg Kroah-Hartman
2016-12-13 8:31 ` Dan Carpenter
2016-12-13 16:14 ` Oleg Drokin
2016-12-13 17:21 ` Dan Carpenter
2016-12-13 0:55 ` Dilger, Andreas
2016-12-13 1:07 ` Greg Kroah-Hartman
2016-12-19 17:02 ` James Simmons
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1481393161-22623-4-git-send-email-jsimmons@infradead.org \
--to=jsimmons@infradead.org \
--cc=andreas.dilger@intel.com \
--cc=bevans@cray.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®