oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduced cdprobe debug; stadir unbreakfix

Browse Source
This commit is contained in:
Ben Gras 2005-08-05 16:08:49 +00:00
parent 473317e571
commit 5cd584b1bb
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
servers/fs/cdprobe.c
View File

@ -33,74 +33,57 @@ PUBLIC int cdprobe(void)
dev = (AT_MAJOR << MAJOR) | minors[i]; dev = (AT_MAJOR << MAJOR) | minors[i];
/* 1. The drive should be a CD - which is not write-openable. /* Open device readonly. (This fails if the device
* Check for this. * is also writable, which a CD isn't.)
*/ */
if((r = dev_open(dev, FS_PROC_NR, R_BIT|W_BIT)) == OK) { printf("%d", i);
printf("%d. no - can open r/w, so no cd\n", i); if((r = dev_open(dev, FS_PROC_NR, RO_BIT)) != OK) {
dev_close(dev); printf("ro", i);
continue; continue;
} }
printf("passed no-r/w test ", i);
/* 2. The drive should be a CD. Open whole drive and
* check for the PVD.
*/
if((r = dev_open(dev, FS_PROC_NR, R_BIT)) != OK) {
printf("%d. no - can't open readonly\n", i);
continue;
}
printf("%d. passed open-readonly test ", i);
if((r = dev_io(DEV_READ, dev, FS_PROC_NR, pvd, if((r = dev_io(DEV_READ, dev, FS_PROC_NR, pvd,
16*CD_SECTOR, sizeof(pvd), 0)) != sizeof(pvd)) { 16*CD_SECTOR, sizeof(pvd), 0)) != sizeof(pvd)) {
printf("%d. no - can't read pvd (%d)\n", i, r); printf("rpvd", i);
dev_close(dev); dev_close(dev);
continue; continue;
} }
dev_close(dev); dev_close(dev);
printf("%d. passed read pvd test ", i);
/* Check PVD ID. */ /* Check PVD ID. */
if(pvd[0] != 1 || pvd[1] != 'C' || pvd[2] != 'D' || if(pvd[0] != 1 || pvd[1] != 'C' || pvd[2] != 'D' ||
pvd[3] != '0' || pvd[4] != '0' || pvd[5] != '1' || pvd[6] != 1 || pvd[3] != '0' || pvd[4] != '0' || pvd[5] != '1' || pvd[6] != 1 ||
strncmp(pvd + 40, "MINIX", 5)) { strncmp(pvd + 40, "MINIX", 5)) {
printf("%d. no - cd signature or minix label not found\n", i, r); printf("vpvd", i, r);
continue; continue;
} }
printf("%d. pvd id test ", i);
/* 3. Both c0dXp1 and p2 should have a superblock. */ /* 3. Both c0dXp1 and p2 should have a superblock. */
for(minor = minors[i]+2; minor <= minors[i]+3; minor++) { for(minor = minors[i]+2; minor <= minors[i]+3; minor++) {
dev = (AT_MAJOR << MAJOR) | minor; dev = (AT_MAJOR << MAJOR) | minor;
if((r = dev_open(dev, FS_PROC_NR, R_BIT)) != OK) { if((r = dev_open(dev, FS_PROC_NR, R_BIT)) != OK) {
printf("%d. no - couldn't open subdev %d\n", i, dev); printf("[o%d]\n", minor);
break; break;
} }
probe_super.s_dev = dev; probe_super.s_dev = dev;
r = read_super(&probe_super); r = read_super(&probe_super);
dev_close(dev); dev_close(dev);
if(r != OK) { if(r != OK) {
printf("%d. subdev %d doesn't contain a superblock\n", i, dev); printf("fs[%d]", minor);
break; break;
} }
printf("%d. (%d) passed superblock test ", i, minor);
} }
if(minor > minors[i]+3) { if(minor > minors[i]+3) {
/* Success? Then set dev to p1. */ /* Success? Then set dev to p1. */
dev = (AT_MAJOR << MAJOR) | (minors[i]+2); dev = (AT_MAJOR << MAJOR) | (minors[i]+2);
found = 1; found = 1;
printf("%d. YES - passed all tests, root is %d\n", i, dev);
break; break;
} else printf("%d. no superblock(s)\n", i); }
} }
printf("\n");
if(!found) { if(!found) return NO_DEV;
return NO_DEV;
}
printf("\nCD probing done.\n");
return dev; return dev;
} }

1
servers/fs/stadir.c
View File

@ -34,7 +34,6 @@ PUBLIC int do_fchdir()
/* Is the file descriptor valid? */ /* Is the file descriptor valid? */
if ( (rfilp = get_filp(m_in.fd)) == NIL_FILP) return(err_code); if ( (rfilp = get_filp(m_in.fd)) == NIL_FILP) return(err_code);
dup_inode(rfilp->filp_ino);
return change_into(&fp->fp_workdir, rfilp->filp_ino); return change_into(&fp->fp_workdir, rfilp->filp_ino);
} }