mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-21 14:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-12-17 21:43:09 -08:00
parent 31cfbadb06 ef0b793811
commit 793c9ca505
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/dev_handlers/scst_vdisk.c
+7 -5
View File
@@ -8756,11 +8756,13 @@ static ssize_t vdev_size_show(struct kobject *kobj, struct kobj_attribute *attr,
dev = container_of(kobj, struct scst_device, dev_kobj);
virt_dev = dev->dh_priv;
size = READ_ONCE(virt_dev->file_size);
if (virt_dev->nullio && size == VDISK_NULLIO_SIZE)
key = false;
else
key = virt_dev->size_key;
/*
* Make sure that scstadmin only stores the 'size' attribute and that
* the 'size_mb' attribute is not stored. Otherwise when restoring
* scst.conf if 'size' is not a multiple of 1 MB it will be rounded
* down.
*/
key = !(virt_dev->nullio && size == VDISK_NULLIO_SIZE) && !size_shift;
return sprintf(buf, "%llu\n%s", size >> size_shift,
key ? SCST_SYSFS_KEY_MARK "\n" : "");