Project

General

Profile

Download (1.9 KB)

Submit #2778 » 0003-lib-libhammer-cleanups.patch

tkusumi, 01/25/2015 06:59 AM

View differences:

lib/libhammer/misc.c
* this function.
*/
while(curmount >= 0) {
struct statfs *mnt = &mntbuf[curmount];
/*
* We need to avoid that PFS belonging to other HAMMER
* filesystems are showed as mounted, so we compare
* against the FSID, which is presumable to be unique.
*/
bzero(&hi, sizeof(hi));
if ((fd = open(mntbuf[curmount].f_mntfromname, O_RDONLY)) < 0) {
if ((fd = open(mnt->f_mntfromname, O_RDONLY)) < 0) {
curmount--;
continue;
}
......
continue;
}
if (strstr(mntbuf[curmount].f_mntfromname, trailstr) != NULL &&
if (strstr(mnt->f_mntfromname, trailstr) != NULL &&
(uuid_compare(&hi.vol_fsid, &parentuuid, NULL)) == 0) {
if (ismaster) {
if (strstr(mntbuf[curmount].f_mntfromname,
if (strstr(mnt->f_mntfromname,
"@@-1") != NULL) {
retval =
strdup(mntbuf[curmount].f_mntonname);
retval = strdup(mnt->f_mntonname);
break;
}
} else {
if (strstr(mntbuf[curmount].f_mntfromname,
if (strstr(mnt->f_mntfromname,
"@@0x") != NULL ) {
retval =
strdup(mntbuf[curmount].f_mntonname);
retval = strdup(mnt->f_mntonname);
break;
}
}
(3-3/3)