From e37a567e1ccd38da3cfe0b55de64515add365158 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 04:12:01 +0000
Subject: [PATCH] Merge r7423 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7676 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/src/dev_handlers/scst_vdisk.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 46a4f1a5c..340d6d109 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -4142,7 +4142,9 @@ static int vdisk_usn_vpd(uint8_t *buf, struct scst_cmd *cmd,
 		usn_len = strlen(virt_dev->usn);
 		buf[3] = usn_len;
 #pragma GCC diagnostic push
+#if __GNUC__ -0 >= 8
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
 		strncpy(&buf[4], virt_dev->usn, usn_len);
 #pragma GCC diagnostic pop
 		read_unlock(&vdisk_serial_rwlock);