github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare whole exported object path during core removal

Browse Source 
Signed-off-by: Slawomir Jankowski <slawomir.jankowski@intel.com>
This commit is contained in:
Slawomir Jankowski 2020-11-06 20:12:42 +01:00
parent 6a803f0985
commit 28b2e0610d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
casadm/cas_lib.c
View File

@ -1807,15 +1807,14 @@ int check_if_mounted(int cache_id, int core_id)
FILE *mtab; FILE *mtab;
struct mntent *mstruct; struct mntent *mstruct;
char dev_buf[80]; char dev_buf[80];
int dev_buf_len; int difference = 0, error = 0;
if (0 <= core_id) { if (core_id >= 0) {
/* verify if specific core is mounted */ /* verify if specific core is mounted */
snprintf(dev_buf, sizeof(dev_buf), "/dev/cas%d-%d", cache_id, core_id); snprintf(dev_buf, sizeof(dev_buf), "/dev/cas%d-%d", cache_id, core_id);
} else { } else {
/* verify if any core from given cache is mounted */ /* verify if any core from given cache is mounted */
snprintf(dev_buf, sizeof(dev_buf), "/dev/cas%d-", cache_id); snprintf(dev_buf, sizeof(dev_buf), "/dev/cas%d-", cache_id);
} }
dev_buf_len = strnlen(dev_buf, sizeof(dev_buf));
mtab = setmntent("/etc/mtab", "r"); mtab = setmntent("/etc/mtab", "r");
if (!mtab) if (!mtab)
@ -1825,9 +1824,11 @@ int check_if_mounted(int cache_id, int core_id)
} }
while ((mstruct = getmntent(mtab)) != NULL) { while ((mstruct = getmntent(mtab)) != NULL) {
error = strncmp_s(mstruct->mnt_fsname, PATH_MAX, dev_buf, sizeof(dev_buf), &difference);
/* mstruct->mnt_fsname is /dev/... block device path, not a mountpoint */ /* mstruct->mnt_fsname is /dev/... block device path, not a mountpoint */
if ((NULL != mstruct->mnt_fsname) if (error)
&& (strncmp(mstruct->mnt_fsname, dev_buf, dev_buf_len) == 0)) { return FAILURE;
if (!difference) {
if (core_id<0) { if (core_id<0) {
cas_printf(LOG_ERR, cas_printf(LOG_ERR,
"Can't stop cache instance %d. Device %s is mounted!\n", "Can't stop cache instance %d. Device %s is mounted!\n",