Commit ab945f32 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

nvmf: Move spdk_internal/nvmf.h to spdk/nvmf_cmd.h 



This is a public header that needs to be accessible to
code outside of the SPDK project. The spdk_internal/
directory does not end up getting packaged - it's just for
headers used by multiple libraries within SPDK.

Change-Id: I14e1ab4fda4b0ee779203d190a266240b10be6ae
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/413


Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarMichael Haeuptle <michaelhaeuptle@gmail.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent cc353f0e

include/spdk_internal/nvmf.h→include/spdk/nvmf_cmd.h

+3 −3
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#ifndef SPDK_INTERNAL_NVMF_H_

#define SPDK_INTERNAL_NVMF_H_

#ifndef SPDK_NVMF_CMD_H_

#define SPDK_NVMF_CMD_H_



#include "spdk/stdinc.h"

#include "spdk/nvmf.h"
@@ -72,4 +72,4 @@ struct spdk_nvme_cmd *spdk_nvmf_request_get_cmd(struct spdk_nvmf_request *req); 
struct spdk_nvme_cpl *spdk_nvmf_request_get_response(struct spdk_nvmf_request *req);

int spdk_nvmf_custom_identify_hdlr(struct spdk_nvmf_request *req);



#endif /* SPDK_INTERNAL_NVMF_H_ */
 
#endif /* SPDK_NVMF_CMD_H_ */

lib/nvmf/ctrlr.c

+1 −1
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ 
#include "spdk/thread.h"

#include "spdk/trace.h"

#include "spdk/nvme_spec.h"

#include "spdk/nvmf_cmd.h"

#include "spdk/string.h"

#include "spdk/util.h"

#include "spdk/version.h"



#include "spdk_internal/nvmf.h"

#include "spdk_internal/log.h"



#define MIN_KEEP_ALIVE_TIMEOUT_IN_MS 10000

lib/nvmf/ctrlr_bdev.c

+1 −1
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ 
#include "spdk/thread.h"

#include "spdk/likely.h"

#include "spdk/nvme.h"

#include "spdk/nvmf_cmd.h"

#include "spdk/nvmf_spec.h"

#include "spdk/trace.h"

#include "spdk/scsi_spec.h"

#include "spdk/string.h"

#include "spdk/util.h"



#include "spdk_internal/nvmf.h"

#include "spdk_internal/log.h"



static bool

lib/nvmf/custom_cmd_hdlr.c

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ 
#include "spdk/stdinc.h"



#include "spdk/bdev.h"

#include "spdk_internal/nvmf.h"

#include "spdk/nvmf_cmd.h"



#include "spdk_internal/log.h"



static void

lib/nvmf/nvmf_internal.h

+1 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 


#include "spdk/likely.h"

#include "spdk/nvmf.h"

#include "spdk/nvmf_cmd.h"

#include "spdk/nvmf_transport.h"

#include "spdk/nvmf_spec.h"

#include "spdk/assert.h"
@@ -46,8 +47,6 @@ 
#include "spdk/util.h"

#include "spdk/thread.h"



#include "spdk_internal/nvmf.h"



enum spdk_nvmf_subsystem_state {

	SPDK_NVMF_SUBSYSTEM_INACTIVE = 0,

	SPDK_NVMF_SUBSYSTEM_ACTIVATING,