--- IOManager.h Sun Sep 26 13:02:16 2004 +++ IOManager.h.mod Sun Sep 26 12:59:47 2004 @@ -48,7 +48,10 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2004-07-26 (mingz@ele.uri.edu) ## */ +/* ## Changes ...: 2004-09-26 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Removed the Reported_As_Logical() function as ## */ +/* ## it does not get used in any part of the code. ## */ +/* ## 2004-07-26 (mingz@ele.uri.edu) ## */ /* ## - Added a member blkdevlist in class Manager ## */ /* ## 2004-03-26 (daniel.scheibli@edelbyte.org) ## */ /* ## - Code cleanup to ensure common style. ## */ @@ -174,9 +177,6 @@ int Report_Disks( Target_Spec *disk_spec ); #if defined(IOMTR_OSFAMILY_UNIX) // These UNIX-specific methods are defined in IOManagerUNIX.cpp. -#if defined(IOMTR_SETTING_OVERRIDE_FS) - BOOL Reported_As_Logical(Target_Spec *spec, char *rdisk, int count); -#endif // IOMTR_SETTING_OVERRIDE_FS BOOL Part_Reported_As_Logical(Target_Spec *spec, char *rdisk, int count); BOOL Sort_Raw_Disk_Names(Target_Spec *disk_spec, int start, int end); --- IOManagerLinux.cpp Sun Sep 26 13:02:16 2004 +++ IOManagerLinux.cpp.mod Sun Sep 26 12:59:49 2004 @@ -49,7 +49,10 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2004-07-26 (mingz@ele.uri.edu) ## */ +/* ## Changes ...: 2004-09-26 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Removed a note about the Reported_As_Logical() ## */ +/* ## function as this one was removed. ## */ +/* ## 2004-07-26 (mingz@ele.uri.edu) ## */ /* ## - Extended the Report_Disks() method to considere ## */ /* ## the blkdevlist. ## */ /* ## 2004-03-27 (daniel.scheibli@edelbyte.org) ## */ @@ -201,7 +204,6 @@ memcpy( &disk_spec[count], &d.spec, sizeof( Target_Spec ) ); disk_spec[count].name[length] = 0; - // check for this pattern is also in Manager;:Reported_As_Logical() // and TargetDisk::Init_Logical(). strcat(disk_spec[count].name, " ["); strcat(disk_spec[count].name, ment->mnt_type); --- IOManagerNetware.cpp Sun Sep 26 13:02:16 2004 +++ IOManagerNetware.cpp.mod Sun Sep 26 12:59:52 2004 @@ -49,10 +49,13 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2004-07-02 (thayneharmon@users.sourceforge.net) ## */ +/* ## Changes ...: 2004-09-26 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Removed a note about the Reported_As_Logical() ## */ +/* ## function as this one was removed. ## */ +/* ## 2004-07-02 (thayneharmon@users.sourceforge.net) ## */ /* ## - fixed error in collecting volumes where the ## */ /* ## netware_vol_info() automacticlly increments the ## */ -/* ## sequence ## */ +/* ## sequence ## */ /* ## 2004-01-01 (thayneharmon@users.sourceforge.net) ## */ /* ## - Initial code. ## */ /* ## ## */ @@ -132,8 +135,7 @@ d.spec.type = LogicalDiskType; memcpy( &disk_spec[count], &d.spec, sizeof( Target_Spec ) ); disk_spec[count].name[length] = 0; - // check for this pattern is also in Manager;:Reported_As_Logical() - // and TargetDisk::Init_Logical(). + // check for this pattern is also in TargetDisk::Init_Logical(). // strcat(disk_spec[count].name, " ["); // strcat(disk_spec[count].name, "NSS"); // strcat(disk_spec[count].name, "]"); --- IOManagerSolaris.cpp Sun Sep 26 13:02:16 2004 +++ IOManagerSolaris.cpp.mod Sun Sep 26 12:59:43 2004 @@ -48,7 +48,12 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2004-02-13 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2004-09-26 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Removed the Reported_As_Logical() function as ## */ +/* ## it does not get used in any part of the code. ## */ +/* ## - Removed the IOMTR_SETTING_OVERRIDE_FS dependency ## */ +/* ## for the Part_Reported_As_Logical() function. ## */ +/* ## 2004-02-13 (daniel.scheibli@edelbyte.org) ## */ /* ## - Reworked the Get_All_Swap_Devices() function to ## */ /* ## fix a few minor inconsistencies. ## */ /* ## 2003-12-21 (daniel.scheibli@edelbyte.org) ## */ @@ -141,8 +146,8 @@ // These disks can be accessed through the /dev/md/rdsk interfaces. Again, they should // not already be mounted as file systems and file names should be sorted. // - // The existing functions Reported_As_Logical() and Sort_Raw_Disk_Names() (for physical - // disks) and Look_For_Partitions() should easily work for the others too. + // The existing functions Sort_Raw_Disk_Names() (for physical disks) and + // Look_For_Partitions() should easily work for the others too. // We should probably give more generic names to these functions. // // Also, if the new cases are implemented, then we should re-introduce prefixing raw @@ -207,8 +212,7 @@ memcpy( &disk_spec[count], &d.spec, sizeof( Target_Spec ) ); disk_spec[count].name[length] = 0; - // check for this pattern is also in Manager;:Reported_As_Logical() - // and TargetDisk::Init_Logical(). + // check for this pattern is also in TargetDisk::Init_Logical(). strcat(disk_spec[count].name, " ["); strcat(disk_spec[count].name, mtab.mnt_fstype); if (buffered) @@ -935,72 +939,7 @@ return(FALSE); } -#if defined(IOMTR_SETTING_OVERRIDE_FS) -BOOL Manager::Reported_As_Logical(Target_Spec *spec, char *rdisk, int count) -{ - int i, retval; - char *p; - char rstr[MAX_NAME], lstr[MAX_NAME]; // for physical/logical disks. - FILE *fp; - struct mnttab mtab, mpref; - // - // TO BE MORE PRECISE : - // This function checks if the "rdisk" has already been mounted. - // The file systems listed in the mnttab file are already mounted. So, we have two - // cases : - // The file system is listed for testing (eg: ufs) or not listed (eg. procfs) - // But we need only check if the file sys is mounted and thats sufficient. That will - // ensure that we don't crash anything running. - // - p = strstr(rdisk, "p0"); - strncpy(rstr, rdisk, p - rdisk); - rstr[p - rdisk] = 0; - - if ((fp = fopen(mnttab, "r")) == NULL) - { - cout << "open (mount tab) file " << mnttab << " failed with error " << errno << endl; - cout << "Set environment variable MNTTAB to correct pathname" << endl; - // We wont try to report any disk. Could expose the OS partition to - // destructive tests. - return TRUE; - } - - for (i = 0; i < count; i++) - { - // Initialize the mpref structure to NULL. Solaris does'nt do it. - memset(&mpref, 0, sizeof(struct mnttab)); -#ifdef _DEBUG - cout << "checking if physical disk already reported as logical." << endl - << " logical disk : " << spec[i].name << " physical disk : " << rdisk << endl; -#endif - // check for this pattern is also in Manager::Report_Disks() - // and TargetDisk::Init_Logical(). - p = strstr(spec[i].name, " ["); - strncpy(lstr, spec[i].name, p - spec[i].name); - lstr[p - spec[i].name] = 0; - - mpref.mnt_mountp = lstr; - if ((retval = getmntany(fp, &mtab, &mpref)) == 0) - { - // found the entry in mnttab. - if (strstr(mtab.mnt_special, rstr)) - { - // the entry contains this physical disk name (in the form c0t0d0). - // further the entry is in the list of reported logical disks. - // So, this physical disk has already been reported as a logical disk. -#ifdef _DEBUG - cout << "physical disk " << rdisk << " reported logical disk " - << mtab.mnt_mountp << endl; -#endif - fclose(fp); - return TRUE; - } - } - } - fclose(fp); - return FALSE; -} BOOL Manager::Part_Reported_As_Logical(Target_Spec *spec, char *rdisk, int count) { @@ -1062,7 +1001,8 @@ fclose(fp); return FALSE; } -#endif // IOMTR_SETTING_OVERRIDE_FS + + BOOL Manager::Sort_Raw_Disk_Names(Target_Spec *disk_spec, int start, int end) { --- IOTargetDisk.cpp Sun Sep 26 13:02:16 2004 +++ IOTargetDisk.cpp.mod Sun Sep 26 12:59:57 2004 @@ -48,7 +48,10 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2004-09-01 (henryx.w.tieman@intel.com) ## */ +/* ## Changes ...: 2004-09-26 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Removed a note about the Reported_As_Logical() ## */ +/* ## function as this one was removed. ## */ +/* ## 2004-09-01 (henryx.w.tieman@intel.com) ## */ /* ## - Initialize iocq structure member. ## */ /* ## - Cleanup some function pointer math. ## */ /* ## - Clean a few comments with non-printing characters. ## */ @@ -313,7 +316,6 @@ // Strip off file system Information about the logical drives. char *p; // check for this pattern is also in Manager::Report_Disks() - // and Manager::Reported_As_Logical(). p = strstr(drive, " ["); if (p) {