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

Commit 1a1faf7a authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

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: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e37a79e5

drivers/infiniband/ulp/srp/ib_srp.c

+6 −5
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ MODULE_LICENSE("Dual BSD/GPL"); 
MODULE_VERSION(DRV_VERSION);

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 cmd_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;

}



#if defined(DYNAMIC_DATA_DEBUG)

static void srp_check_mapping(struct srp_map_state *state,

			      struct srp_rdma_ch *ch, struct srp_request *req,

			      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,

		       state->ndesc, state->nmdesc);

}

#endif



/**

 * 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)

		goto unmap;



#if defined(DYNAMIC_DEBUG)

	{

		DEFINE_DYNAMIC_DEBUG_METADATA(ddm,

			"Memory mapping consistency check");

		if (unlikely(ddm.flags & _DPRINTK_FLAGS_PRINT))

		if (DYNAMIC_DEBUG_BRANCH(ddm))

			srp_check_mapping(&state, ch, req, scat, count);

	}

#endif



	/* We've mapped the request, now pull as much of the indirect

	 * descriptor table as we can into the command buffer. If this