p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IB/srp: Fix CONFIG_DYNAMIC_DEBUG=n build 

Avoid that the kernel build fails as follows if dynamic debug support
is disabled:

drivers/infiniband/ulp/srp/ib_srp.c:2272:3: error: implicit declaration of function 'DEFINE_DYNAMIC_DEBUG_METADATA'
drivers/infiniband/ulp/srp/ib_srp.c:2272:33: error: 'ddm' undeclared (first use in this function)
drivers/infiniband/ulp/srp/ib_srp.c:2275:39: error: '_DPRINTK_FLAGS_PRINT' undeclared (first use in this function)

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Bart Van Assche 2016-11-21 13:56:46 -08:00 committed by Doug Ledford
parent e37a79e5d4
commit 1a1faf7a8a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/infiniband/ulp/srp/ib_srp.c
View File

@ -64,6 +64,11 @@ MODULE_LICENSE("Dual BSD/GPL");
MODULE_VERSION(DRV_VERSION); MODULE_VERSION(DRV_VERSION);
MODULE_INFO(release_date, DRV_RELDATE); MODULE_INFO(release_date, DRV_RELDATE);
#if !defined(CONFIG_DYNAMIC_DEBUG)
#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt)
#define DYNAMIC_DEBUG_BRANCH(descriptor) false
#endif
static unsigned int srp_sg_tablesize; static unsigned int srp_sg_tablesize;
static unsigned int cmd_sg_entries; static unsigned int cmd_sg_entries;
static unsigned int indirect_sg_entries; static unsigned int indirect_sg_entries;
@ -1556,7 +1561,6 @@ static int srp_map_idb(struct srp_rdma_ch *ch, struct srp_request *req,
return 0; return 0;
} }
#if defined(DYNAMIC_DATA_DEBUG)
static void srp_check_mapping(struct srp_map_state *state, static void srp_check_mapping(struct srp_map_state *state,
struct srp_rdma_ch *ch, struct srp_request *req, struct srp_rdma_ch *ch, struct srp_request *req,
struct scatterlist *scat, int count) struct scatterlist *scat, int count)
@ -1580,7 +1584,6 @@ static void srp_check_mapping(struct srp_map_state *state,
scsi_bufflen(req->scmnd), desc_len, mr_len, scsi_bufflen(req->scmnd), desc_len, mr_len,
state->ndesc, state->nmdesc); state->ndesc, state->nmdesc);
} }
#endif
/** /**
* srp_map_data() - map SCSI data buffer onto an SRP request * srp_map_data() - map SCSI data buffer onto an SRP request
@ -1669,14 +1672,12 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_rdma_ch *ch,
if (ret < 0) if (ret < 0)
goto unmap; goto unmap;
#if defined(DYNAMIC_DEBUG)
{ {
DEFINE_DYNAMIC_DEBUG_METADATA(ddm, DEFINE_DYNAMIC_DEBUG_METADATA(ddm,
"Memory mapping consistency check"); "Memory mapping consistency check");
if (unlikely(ddm.flags & _DPRINTK_FLAGS_PRINT)) if (DYNAMIC_DEBUG_BRANCH(ddm))
srp_check_mapping(&state, ch, req, scat, count); srp_check_mapping(&state, ch, req, scat, count);
} }
#endif
/* We've mapped the request, now pull as much of the indirect /* We've mapped the request, now pull as much of the indirect
* descriptor table as we can into the command buffer. If this * descriptor table as we can into the command buffer. If this