Commit c55cdc4f authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

nvmf: fix SHIFT_4KB redefinition by NVMF_ prefix 



it is defined in memory.h

Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I3a65f82e565dc56c5d4e3e0211571e1d1dddf393
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/920


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@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>
parent a00efdbf

include/spdk/nvmf_transport.h

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ 
/* AIO backend requires block size aligned data buffers,

 * extra 4KiB aligned data buffer should work for most devices.

 */

#define SHIFT_4KB			12u

#define NVMF_DATA_BUFFER_ALIGNMENT	(1u << SHIFT_4KB)

#define NVMF_SHIFT_4KB			12u

#define NVMF_DATA_BUFFER_ALIGNMENT	(1u << NVMF_SHIFT_4KB)

#define NVMF_DATA_BUFFER_MASK		(NVMF_DATA_BUFFER_ALIGNMENT - 1LL)



union nvmf_h2c_msg {