openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: lustre: lnet: migrate headers to lnet uapi directory 

Migrate the headers used by user land and kernel space to the
libcfs/lnet uapi directory.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245
Reviewed-on: https://review.whamcloud.com/28089
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Olaf Weber <olaf.weber@hpe.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:
James Simmons 2017-08-19 22:26:30 -04:00 committed by Greg Kroah-Hartman
parent 28cb3e268f
commit 037697dc2a
28 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/include/linux/libcfs/libcfs.h
View File

@ -77,7 +77,7 @@ void cfs_get_random_bytes(void *buf, int size);
#include "libcfs_debug.h"
#include "libcfs_cpu.h"
#include "libcfs_private.h"
#include "libcfs_ioctl.h"
#include "../../uapi/linux/lnet/libcfs_ioctl.h"
#include "libcfs_prim.h"
#include "libcfs_time.h"
#include "libcfs_string.h"

2
drivers/staging/lustre/include/linux/lnet/api.h
View File

@ -44,7 +44,7 @@
* @{
*/
#include "../lnet/types.h"
#include "../../uapi/linux/lnet/lnet-types.h"
/** \defgroup lnet_init_fini Initialization and cleanup
* The LNet must be properly initialized before any LNet calls can be made.

8
drivers/staging/lustre/include/linux/lnet/lib-lnet.h
View File

@ -38,10 +38,10 @@
#include "../libcfs/libcfs.h"
#include "api.h"
#include "lib-types.h"
#include "lib-dlc.h"
#include "types.h"
#include "lnetctl.h"
#include "nidstr.h"
#include "../../uapi/linux/lnet/lnet-dlc.h"
#include "../../uapi/linux/lnet/lnet-types.h"
#include "../../uapi/linux/lnet/lnetctl.h"
#include "../../uapi/linux/lnet/nidstr.h"
extern struct lnet the_lnet; /* THE network */

4
drivers/staging/lustre/include/linux/lnet/lib-types.h
View File

@ -40,8 +40,8 @@
#include <linux/types.h>
#include <linux/completion.h>
#include "types.h"
#include "lnetctl.h"
#include "../../uapi/linux/lnet/lnet-types.h"
#include "../../uapi/linux/lnet/lnetctl.h"
/* Max payload size */
#define LNET_MAX_PAYLOAD CONFIG_LNET_MAX_PAYLOAD

2
drivers/staging/lustre/include/linux/lnet/socklnd.h
View File

@ -34,7 +34,7 @@
#ifndef __LNET_LNET_SOCKLND_H__
#define __LNET_LNET_SOCKLND_H__
#include "types.h"
#include "../../uapi/linux/lnet/lnet-types.h"
#include "../../uapi/linux/lnet/socklnd.h"
struct ksock_hello_msg {

0
drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h → drivers/staging/lustre/include/uapi/linux/lnet/libcfs_ioctl.h
View File

4
drivers/staging/lustre/include/linux/lnet/lib-dlc.h → drivers/staging/lustre/include/uapi/linux/lnet/lnet-dlc.h
View File

@ -29,8 +29,8 @@
#ifndef LNET_DLC_H
#define LNET_DLC_H
#include "../libcfs/libcfs_ioctl.h"
#include "types.h"
#include "libcfs_ioctl.h"
#include "lnet-types.h"
#define MAX_NUM_SHOW_ENTRIES 32
#define LNET_MAX_STR_LEN 128

0
drivers/staging/lustre/include/linux/lnet/types.h → drivers/staging/lustre/include/uapi/linux/lnet/lnet-types.h
View File

2
drivers/staging/lustre/include/linux/lnet/lnetctl.h → drivers/staging/lustre/include/uapi/linux/lnet/lnetctl.h
View File

@ -15,7 +15,7 @@
#ifndef _LNETCTL_H_
#define _LNETCTL_H_
#include "types.h"
#include "lnet-types.h"
/** \addtogroup lnet_fault_simulation
* @{

0
drivers/staging/lustre/include/linux/lnet/lnetst.h → drivers/staging/lustre/include/uapi/linux/lnet/lnetst.h
View File

2
drivers/staging/lustre/include/linux/lnet/nidstr.h → drivers/staging/lustre/include/uapi/linux/lnet/nidstr.h
View File

@ -28,7 +28,7 @@
#ifndef _LNET_NIDSTRINGS_H
#define _LNET_NIDSTRINGS_H
#include "types.h"
#include "lnet-types.h"
/**
* Lustre Network Driver types.

2
drivers/staging/lustre/lnet/libcfs/module.c
View File

@ -55,7 +55,7 @@
#include "../../include/linux/libcfs/libcfs_crypto.h"
#include "../../include/linux/lnet/lib-lnet.h"
#include "../../include/linux/lnet/lib-dlc.h"
#include "../../include/uapi/linux/lnet/lnet-dlc.h"
#include "tracefile.h"
static struct dentry *lnet_debugfs_root;

2
drivers/staging/lustre/lnet/lnet/api-ni.c
View File

@ -35,7 +35,7 @@
#include <linux/ktime.h>
#include "../../include/linux/lnet/lib-lnet.h"
#include "../../include/linux/lnet/lib-dlc.h"
#include "../../include/uapi/linux/lnet/lnet-dlc.h"
#define D_LNI D_CONSOLE

2
drivers/staging/lustre/lnet/lnet/module.c
View File

@ -32,7 +32,7 @@
#define DEBUG_SUBSYSTEM S_LNET
#include "../../include/linux/lnet/lib-lnet.h"
#include "../../include/linux/lnet/lib-dlc.h"
#include "../../include/uapi/linux/lnet/lnet-dlc.h"
static int config_on_load;
module_param(config_on_load, int, 0444);

2
drivers/staging/lustre/lnet/lnet/net_fault.c
View File

@ -36,7 +36,7 @@
#define DEBUG_SUBSYSTEM S_LNET
#include "../../include/linux/lnet/lib-lnet.h"
#include "../../include/linux/lnet/lnetctl.h"
#include "../../include/uapi/linux/lnet/lnetctl.h"
#define LNET_MSG_MASK (LNET_PUT_BIT | LNET_ACK_BIT | \
LNET_GET_BIT | LNET_REPLY_BIT)

2
drivers/staging/lustre/lnet/lnet/nidstrings.c
View File

@ -37,7 +37,7 @@
#define DEBUG_SUBSYSTEM S_LNET
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/nidstr.h"
#include "../../include/uapi/linux/lnet/nidstr.h"
/* max value for numeric network address */
#define MAX_NUMERIC_VALUE 0xffffffff

2
drivers/staging/lustre/lnet/lnet/peer.c
View File

@ -35,7 +35,7 @@
#define DEBUG_SUBSYSTEM S_LNET
#include "../../include/linux/lnet/lib-lnet.h"
#include "../../include/linux/lnet/lib-dlc.h"
#include "../../include/uapi/linux/lnet/lnet-dlc.h"
int
lnet_peer_tables_create(void)

2
drivers/staging/lustre/lnet/selftest/conctl.c
View File

@ -38,7 +38,7 @@
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/lib-lnet.h"
#include "../../include/linux/lnet/lnetst.h"
#include "../../include/uapi/linux/lnet/lnetst.h"
#include "console.h"
static int

2
drivers/staging/lustre/lnet/selftest/conrpc.h
View File

@ -41,7 +41,7 @@
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/lib-types.h"
#include "../../include/linux/lnet/lnetst.h"
#include "../../include/uapi/linux/lnet/lnetst.h"
#include "rpc.h"
#include "selftest.h"

2
drivers/staging/lustre/lnet/selftest/console.h
View File

@ -41,7 +41,7 @@
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/lib-types.h"
#include "../../include/linux/lnet/lnetst.h"
#include "../../include/uapi/linux/lnet/lnetst.h"
#include "selftest.h"
#include "conrpc.h"

2
drivers/staging/lustre/lnet/selftest/rpc.h
View File

@ -33,7 +33,7 @@
#ifndef __SELFTEST_RPC_H__
#define __SELFTEST_RPC_H__
#include "../../include/linux/lnet/lnetst.h"
#include "../../include/uapi/linux/lnet/lnetst.h"
/*
* LST wired structures

2
drivers/staging/lustre/lnet/selftest/selftest.h
View File

@ -41,7 +41,7 @@
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/lib-lnet.h"
#include "../../include/linux/lnet/lib-types.h"
#include "../../include/linux/lnet/lnetst.h"
#include "../../include/uapi/linux/lnet/lnetst.h"
#include "rpc.h"
#include "timer.h"

3
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
View File

@ -70,8 +70,7 @@
#define _LUSTRE_IDL_H_
#include "../../../include/linux/libcfs/libcfs.h"
#include "../../../include/linux/lnet/types.h"
#include "../../../include/uapi/linux/lnet/lnet-types.h"
/* Defn's shared with user-space. */
#include "lustre_user.h"
#include "../lustre_ver.h"

1
drivers/staging/lustre/lustre/include/lustre_disk.h
View File

@ -45,7 +45,6 @@
*/
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/types.h"
#include <linux/backing-dev.h>
/****************** persistent mount data *********************/

2
drivers/staging/lustre/lustre/include/lustre_net.h
View File

@ -52,7 +52,7 @@
#include <linux/uio.h>
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/nidstr.h"
#include "../../include/uapi/linux/lnet/nidstr.h"
#include "../../include/linux/lnet/api.h"
#include "lustre/lustre_idl.h"
#include "lustre_ha.h"

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

@ -35,7 +35,7 @@
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../../include/linux/lnet/lnetctl.h"
#include "../../include/uapi/linux/lnet/lnetctl.h"
#include "../include/lustre_debug.h"
#include "../include/lprocfs_status.h"
#include <linux/list.h>

2
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
View File

@ -61,7 +61,7 @@
#include <linux/kobject.h>
#include "../../../include/linux/libcfs/libcfs.h"
#include "../../../include/linux/lnet/lnetctl.h"
#include "../../../include/uapi/linux/lnet/lnetctl.h"
#include "../../include/obd_support.h"
#include "../../include/obd_class.h"
#include "../../include/lprocfs_status.h"

2
drivers/staging/lustre/lustre/ptlrpc/service.c
View File

@ -35,7 +35,7 @@
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lu_object.h"
#include "../../include/linux/lnet/types.h"
#include "../../include/uapi/linux/lnet/lnet-types.h"
#include "ptlrpc_internal.h"
/* The following are visible and mutable through /sys/module/ptlrpc */