From 496c494c549b3a2048d031b06fa65962ccf3d7d6 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 04:29:30 +0000
Subject: [PATCH] Merge r7446 from trunk

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

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