leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: lustre: headers: sort headers affected by swab move

Browse Source 
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/16339
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ben Evans 2016-12-02 14:40:46 -05:00 committed by Greg Kroah-Hartman
parent 36dc51ccb3
commit 884a136940
8 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/lustre/lustre/lov/lov_obd.c
View File

@ -40,19 +40,20 @@
#define DEBUG_SUBSYSTEM S_LOV
#include "../../include/linux/libcfs/libcfs.h"
#include "../include/obd_support.h"
#include "../include/lustre/lustre_ioctl.h"
#include "../include/lustre_lib.h"
#include "../include/lustre_net.h"
#include "../include/lustre/lustre_idl.h"
#include "../include/lustre/lustre_ioctl.h"
#include "../include/cl_object.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_fid.h"
#include "../include/lustre_lib.h"
#include "../include/lustre_mds.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lustre_param.h"
#include "../include/lustre_swab.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre_param.h"
#include "../include/cl_object.h"
#include "../include/lustre_fid.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "lov_internal.h"

6
drivers/staging/lustre/lustre/lov/lov_pack.c
View File

@ -38,15 +38,17 @@
#define DEBUG_SUBSYSTEM S_LOV
#include "../include/lustre/lustre_idl.h"
#include "../include/lustre/lustre_user.h"
#include "../include/lustre_net.h"
#include "../include/lustre_swab.h"
#include "../include/obd.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre/lustre_user.h"
#include "lov_internal.h"
#include "lov_cl_internal.h"
#include "lov_internal.h"
void lov_dump_lmm_common(int level, void *lmmp)
{

15
drivers/staging/lustre/lustre/mdc/mdc_request.c
View File

@ -38,17 +38,18 @@
# include <linux/init.h>
# include <linux/utsname.h>
#include "../include/cl_object.h"
#include "../include/llog_swab.h"
#include "../include/lustre_acl.h"
#include "../include/lustre/lustre_ioctl.h"
#include "../include/obd_class.h"
#include "../include/lustre_lmv.h"
#include "../include/lustre_fid.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre_param.h"
#include "../include/lustre_log.h"
#include "../include/lustre_acl.h"
#include "../include/lustre_fid.h"
#include "../include/lustre/lustre_ioctl.h"
#include "../include/lustre_kernelcomm.h"
#include "../include/lustre_lmv.h"
#include "../include/lustre_log.h"
#include "../include/lustre_param.h"
#include "../include/lustre_swab.h"
#include "../include/obd_class.h"
#include "mdc_internal.h"

7
drivers/staging/lustre/lustre/mgc/mgc_request.c
View File

@ -38,12 +38,13 @@
#define D_MGC D_CONFIG /*|D_WARNING*/
#include <linux/module.h>
#include "../include/obd_class.h"
#include "../include/lustre_dlm.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre_log.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_disk.h"
#include "../include/lustre_log.h"
#include "../include/lustre_swab.h"
#include "../include/obd_class.h"
#include "mgc_internal.h"

2
drivers/staging/lustre/lustre/obdclass/llog.c
View File

@ -44,8 +44,8 @@
#define DEBUG_SUBSYSTEM S_LOG
#include "../include/llog_swab.h"
#include "../include/obd_class.h"
#include "../include/lustre_log.h"
#include "../include/obd_class.h"
#include "llog_internal.h"
/*

6
drivers/staging/lustre/lustre/obdclass/obd_config.c
View File

@ -35,13 +35,15 @@
*/
#define DEBUG_SUBSYSTEM S_CLASS
#include "../include/obd_class.h"
#include <linux/string.h>
#include "../include/lustre/lustre_ioctl.h"
#include "../include/llog_swab.h"
#include "../include/lustre_log.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre_log.h"
#include "../include/lustre_param.h"
#include "../include/obd_class.h"
#include "llog_internal.h"

14
drivers/staging/lustre/lustre/ptlrpc/layout.c
View File

@ -48,23 +48,21 @@
#include <linux/module.h>
/* LUSTRE_VERSION_CODE */
#include "../include/lustre_ver.h"
#include "../include/obd_support.h"
/* lustre_swab_mdt_body */
#include "../include/lustre/lustre_idl.h"
/* obd2cli_tgt() (required by DEBUG_REQ()) */
#include "../include/llog_swab.h"
#include "../include/lustre_debug.h"
#include "../include/lustre_swab.h"
#include "../include/lustre_ver.h"
#include "../include/obd.h"
#include "../include/obd_support.h"
/* __REQ_LAYOUT_USER__ */
#endif
#include "../include/llog_swab.h"
/* struct ptlrpc_request, lustre_msg* */
#include "../include/lustre_req_layout.h"
#include "../include/lustre_acl.h"
#include "../include/lustre_debug.h"
#include "../include/lustre_swab.h"
/*
* RQFs (see below) refer to two struct req_msg_field arrays describing the

7
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
View File

@ -42,13 +42,14 @@
#include "../../include/linux/libcfs/libcfs.h"
#include "../include/lustre/ll_fiemap.h"
#include "../include/llog_swab.h"
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lustre_swab.h"
#include "../include/obd_cksum.h"
#include "../include/lustre/ll_fiemap.h"
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "ptlrpc_internal.h"