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

Commit 2708f295 authored by Don Brace's avatar Don Brace Committed by Martin K. Petersen
Browse files

hpsa: fix path_info_show 



Left off some changes from Rasmus Villemoes where he changed snprintf to
scnprintf.

Suggested-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: default avatarJustin Lindley <justin.lindley@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a8036dfb

drivers/scsi/hpsa.c

+6 −6
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ static ssize_t path_info_show(struct device *dev, 
		if (hdev->external ||

			hdev->devtype == TYPE_RAID ||

			is_logical_device(hdev)) {

			output_len += snprintf(buf + output_len,

			output_len += scnprintf(buf + output_len,

						PAGE_SIZE - output_len,

						"%s\n", active);

			continue;
@@ -809,28 +809,28 @@ static ssize_t path_info_show(struct device *dev, 
		if (phys_connector[1] < '0')

			phys_connector[1] = '0';

		if (hdev->phys_connector[i] > 0)

			output_len += snprintf(buf + output_len,

			output_len += scnprintf(buf + output_len,

				PAGE_SIZE - output_len,

				"PORT: %.2s ",

				phys_connector);

		if (hdev->devtype == TYPE_DISK && hdev->expose_device) {

			if (box == 0 || box == 0xFF) {

				output_len += snprintf(buf + output_len,

				output_len += scnprintf(buf + output_len,

					PAGE_SIZE - output_len,

					"BAY: %hhu %s\n",

					bay, active);

			} else {

				output_len += snprintf(buf + output_len,

				output_len += scnprintf(buf + output_len,

					PAGE_SIZE - output_len,

					"BOX: %hhu BAY: %hhu %s\n",

					box, bay, active);

			}

		} else if (box != 0 && box != 0xFF) {

			output_len += snprintf(buf + output_len,

			output_len += scnprintf(buf + output_len,

				PAGE_SIZE - output_len, "BOX: %hhu %s\n",

				box, active);

		} else

			output_len += snprintf(buf + output_len,

			output_len += scnprintf(buf + output_len,

				PAGE_SIZE - output_len, "%s\n", active);

	}