From ce52affcdf8dc1e1c722c80a8abfeca94ed6de57 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 3 Aug 2016 02:49:31 +0000 Subject: [PATCH] scst_vdisk: don't report unmap alignment, if it is equal to unmap granularity git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6930 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 ae2798a4d..24d970669 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -1062,6 +1062,8 @@ check: (defined(RHEL_MAJOR) && RHEL_MAJOR -0 >= 6) virt_dev->unmap_opt_gran = q->limits.discard_granularity >> block_shift; virt_dev->unmap_align = q->limits.discard_alignment >> block_shift; + if (virt_dev->unmap_opt_gran == virt_dev->unmap_align) + virt_dev->unmap_align = 0; virt_dev->unmap_max_lba_cnt = q->limits.max_discard_sectors >> (block_shift - 9); virt_dev->discard_zeroes_data = q->limits.discard_zeroes_data; #else