Commit d0290b65 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

scsi_internal.h: remove duplicated min/max macros 



Use the ones from spdk/util.h instead.

Change-Id: Icd8416d1b3cb0cde35ac46ea8b1ba7a1ea8994c6
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 12965bb6

lib/scsi/lun.c

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "spdk/env.h"

#include "spdk/io_channel.h"

#include "spdk/event.h"

#include "spdk/util.h"



void

spdk_scsi_lun_complete_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)
@@ -204,7 +205,7 @@ spdk_scsi_task_process_null_lun(struct spdk_scsi_task *task) 
		buffer[4] = data_len - 5;



		allocation_len = from_be16(&task->cdb[3]);

		if (spdk_scsi_task_scatter_data(task, buffer, SPDK_MIN(allocation_len, data_len)) >= 0) {

		if (spdk_scsi_task_scatter_data(task, buffer, spdk_min(allocation_len, data_len)) >= 0) {

			task->data_transferred = data_len;

			task->status = SPDK_SCSI_STATUS_GOOD;

		}

lib/scsi/scsi_bdev.c

+8 −7
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "spdk/bdev.h"

#include "spdk/endian.h"

#include "spdk/string.h"

#include "spdk/util.h"



#define SPDK_WORK_BLOCK_SIZE		(1ULL * 1024ULL * 1024ULL)

#define SPDK_WORK_ATS_BLOCK_SIZE	(1ULL * 1024ULL * 1024ULL)
@@ -1618,7 +1619,7 @@ spdk_bdev_scsi_process_block(struct spdk_bdev *bdev, 
		}

		to_be32(&buffer[4], bdev->blocklen);



		len = SPDK_MIN(task->length, sizeof(buffer));

		len = spdk_min(task->length, sizeof(buffer));

		if (spdk_scsi_task_scatter_data(task, buffer, len) < 0)

			break;
@@ -1643,7 +1644,7 @@ spdk_bdev_scsi_process_block(struct spdk_bdev *bdev, 
				buffer[14] |= 1 << 7;

			}



			len = SPDK_MIN(from_be32(&cdb[10]), sizeof(buffer));

			len = spdk_min(from_be32(&cdb[10]), sizeof(buffer));

			if (spdk_scsi_task_scatter_data(task, buffer, len) < 0)

				break;
@@ -1717,11 +1718,11 @@ spdk_bdev_scsi_process_primary(struct spdk_bdev *bdev, 
	switch (cdb[0]) {

	case SPDK_SPC_INQUIRY:

		alloc_len = from_be16(&cdb[3]);

		data_len = SPDK_MAX(4096, alloc_len);

		data_len = spdk_max(4096, alloc_len);

		data = spdk_zmalloc(data_len, 0, NULL);

		assert(data != NULL);

		rc = spdk_bdev_scsi_inquiry(bdev, task, cdb, data, data_len);

		data_len = SPDK_MIN(rc, data_len);

		data_len = spdk_min(rc, data_len);

		if (rc < 0) {

			break;

		}
@@ -1741,7 +1742,7 @@ spdk_bdev_scsi_process_primary(struct spdk_bdev *bdev, 
			break;

		}



		data_len = SPDK_MAX(4096, alloc_len);

		data_len = spdk_max(4096, alloc_len);

		data = spdk_zmalloc(data_len, 0, NULL);

		assert(data != NULL);

		rc = spdk_bdev_scsi_report_luns(task->lun, sel, data, data_len);
@@ -1931,8 +1932,8 @@ spdk_bdev_scsi_process_primary(struct spdk_bdev *bdev, 


	if (rc >= 0 && data_len > 0) {

		assert(alloc_len >= 0);

		spdk_scsi_task_scatter_data(task, data, SPDK_MIN(alloc_len, data_len));

		rc = SPDK_MIN(data_len, alloc_len);

		spdk_scsi_task_scatter_data(task, data, spdk_min(alloc_len, data_len));

		rc = spdk_min(data_len, alloc_len);

	}



	if (rc >= 0) {

lib/scsi/scsi_internal.h

+0 −19
Original line number Diff line number Diff line
@@ -56,25 +56,6 @@ 


#include "spdk_internal/log.h"





/**

 * Macro to return the minimum of two numbers

 */

#define SPDK_MIN(a, b) ({ \

		typeof (a) _a = (a); \

		typeof (b) _b = (b); \

		_a < _b ? _a : _b; \

	})



/**

 * Macro to return the maximum of two numbers

 */

#define SPDK_MAX(a, b) ({ \

		typeof (a) _a = (a); \

		typeof (b) _b = (b); \

		_a > _b ? _a : _b; \

	})



enum {

	SPDK_SCSI_TASK_UNKNOWN = -1,

	SPDK_SCSI_TASK_COMPLETE,

lib/scsi/task.c

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "scsi_internal.h"

#include "spdk/endian.h"

#include "spdk/env.h"

#include "spdk/util.h"



void

spdk_scsi_task_put(struct spdk_scsi_task *task)
@@ -162,7 +163,7 @@ spdk_scsi_task_scatter_data(struct spdk_scsi_task *task, const void *src, size_t 
	pos = src;



	for (i = 0; i < task->iovcnt; i++) {

		len = SPDK_MIN(iovs[i].iov_len, buf_left);

		len = spdk_min(iovs[i].iov_len, buf_left);

		buf_left -= len;

		memcpy(iovs[i].iov_base, pos, len);

		pos += len;