Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 884a1369 authored by Ben Evans's avatar Ben Evans Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarBen Evans <bevans@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: http://review.whamcloud.com/16339


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36dc51cc

drivers/staging/lustre/lustre/lov/lov_obd.c

+9 −8
Original line number Diff line number Diff line
@@ -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"

drivers/staging/lustre/lustre/lov/lov_pack.c

+4 −2
Original line number Diff line number Diff line
@@ -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)

{

drivers/staging/lustre/lustre/mdc/mdc_request.c

+6 −5
Original line number Diff line number Diff line
@@ -38,17 +38,18 @@ 
# include <linux/init.h>

# include <linux/utsname.h>



#include "../include/cl_object.h"

#include "../include/llog_swab.h"

#include "../include/lprocfs_status.h"

#include "../include/lustre_acl.h"

#include "../include/lustre_fid.h"

#include "../include/lustre/lustre_ioctl.h"

#include "../include/obd_class.h"

#include "../include/lustre_kernelcomm.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_kernelcomm.h"

#include "../include/lustre_param.h"

#include "../include/lustre_swab.h"

#include "../include/obd_class.h"



#include "mdc_internal.h"

drivers/staging/lustre/lustre/mgc/mgc_request.c

+4 −3
Original line number Diff line number Diff line
@@ -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"

drivers/staging/lustre/lustre/obdclass/llog.c

+1 −1
Original line number Diff line number Diff line
@@ -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"



/*