Author: aschnell Date: Wed Apr 1 16:04:43 2009 New Revision: 56540 URL: http://svn.opensuse.org/viewcvs/yast?rev=56540&view=rev Log: - make some functions const/static - some cleanup Modified: trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/NfsCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Wed Apr 1 16:04:43 2009 @@ -405,7 +405,7 @@ if( i->created() ) { unsigned long long s; - getStorage()->waitForDevice( i->device() ); + Storage::waitForDevice(i->device()); i->setCreated( false ); if( ppart.getSize( i->device(), s )) { Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Wed Apr 1 16:04:43 2009 @@ -2015,7 +2015,7 @@ if( ret==0 ) { if( !dmp_slave ) - getStorage()->waitForDevice( p->device() ); + Storage::waitForDevice(p->device()); p->changeIdDone(); } } @@ -2251,7 +2251,7 @@ if( !dmp_slave ) { if( p->type()!=EXTENDED ) - getStorage()->waitForDevice( p->device() ); + Storage::waitForDevice(p->device()); else Storage::waitForDevice(); if( p->type()==LOGICAL && getStorage()->instsys() ) @@ -2274,7 +2274,7 @@ y2mil("zeroNew:" << getStorage()->getZeroNewPartitions() << " used_as_pv:" << used_as_pv); if( used_as_pv || getStorage()->getZeroNewPartitions() ) { - ret = getStorage()->zeroDevice(p->device(), p->sizeK()); + ret = Storage::zeroDevice(p->device(), p->sizeK()); } else if( !dmp_slave && !p->getFormat() ) { @@ -2298,7 +2298,7 @@ { SystemCmd c("/sbin/blockdev --rereadpt " + quote(device())); if( p->type()!=EXTENDED ) - getStorage()->waitForDevice( p->device() ); + Storage::waitForDevice(p->device()); } } else @@ -2540,7 +2540,7 @@ ret = DISK_RESIZE_PARTITION_PARTED_FAILED; } if( ret==0 && !dmp_slave ) - getStorage()->waitForDevice( p->device() ); + Storage::waitForDevice(p->device()); if( !getPartedValues( p )) { if( ret==0 ) Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.cc?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Wed Apr 1 16:04:43 2009 @@ -777,7 +777,7 @@ l->updateSize( pp ); } if( p->type()!=EXTENDED ) - getStorage()->waitForDevice( l->device() ); + Storage::waitForDevice(l->device()); } y2mil("ret:" << ret); return( ret ); @@ -876,7 +876,7 @@ ProcPart pp; updateMinor(); l->updateSize( pp ); - getStorage()->waitForDevice( l->device() ); + Storage::waitForDevice(l->device()); } if( ret==0 && remount ) ret = l->mount(); Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Wed Apr 1 16:04:43 2009 @@ -32,7 +32,7 @@ getVgData( Name, false ); LvmLvPair p=lvmLvPair(lvNotCreated); if( !p.empty() ) - getStorage()->waitForDevice( p.begin()->device() ); + Storage::waitForDevice(p.begin()->device()); } else { @@ -1367,7 +1367,7 @@ } if( ret==0 ) { - getStorage()->waitForDevice( l->device() ); + Storage::waitForDevice(l->device()); l->setCreated(false); getVgData( name() ); checkConsistency(); Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Wed Apr 1 16:04:43 2009 @@ -613,14 +613,14 @@ } if( ret==0 ) { - getStorage()->waitForDevice( m->device() ); + Storage::waitForDevice(m->device()); getMdData( m->nr() ); updateEntry( m ); bool used_as_pv = m->getUsedByType() == UB_LVM; y2mil("zeroNew:" << getStorage()->getZeroNewPartitions() << " used_as_pv:" << used_as_pv); if( used_as_pv || getStorage()->getZeroNewPartitions() ) { - ret = getStorage()->zeroDevice(m->device(), m->sizeK()); + ret = Storage::zeroDevice(m->device(), m->sizeK()); } } } Modified: trunk/storage/libstorage/src/NfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/NfsCo.cc?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/NfsCo.cc (original) +++ trunk/storage/libstorage/src/NfsCo.cc Wed Apr 1 16:04:43 2009 @@ -183,8 +183,7 @@ n->setFstabOption( boost::join(i->opts, "," ) ); addToList( n ); } - unsigned long long sz = getStorage()->getDfSize( i->mount ); - n->setSize( sz ); + n->setSize(Storage::getDfSize(i->mount)); } } l.clear(); Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Wed Apr 1 16:04:43 2009 @@ -4821,7 +4821,7 @@ ret = false; danglingUsedBy[dev] = storage::usedBy(ub_type, ub_name); y2mil("adding ub_type:" << ub_type << " ub_name:" << ub_name << - " for dev: " << dev << " to dangling usedby"); + " for dev:" << dev << " to dangling usedby"); } } else @@ -5040,16 +5040,19 @@ return( ret ); } -bool Storage::deletedDevice( const string& dev ) - { - VPair p = vPair( Volume::isDeleted ); - VolIterator v = p.begin(); + +bool +Storage::deletedDevice(const string& dev) const +{ + ConstVolPair p = volPair(Volume::isDeleted); + ConstVolIterator v = p.begin(); while( v!=p.end() && v->device()!=dev ) ++v; bool ret = v!=p.end(); y2mil("dev:" << dev << " ret:" << ret); - return( ret ); - } + return ret; +} + bool Storage::isDisk( const string& dev ) { @@ -5093,8 +5096,10 @@ return( ret ); } -string Storage::deviceByNumber( const string& majmin ) - { + +string +Storage::deviceByNumber(const string& majmin) const +{ string ret=""; string::size_type pos = majmin.find( ":" ); if( pos!=string::npos ) @@ -5130,8 +5135,9 @@ } } y2mil("majmin:" << majmin << " ret:" << ret); - return( ret ); - } + return ret; +} + unsigned long long Storage::deviceSize( const string& dev ) { @@ -5344,9 +5350,10 @@ return( ret ); } -unsigned long long -Storage::getDfSize( const string& mp ) - { + +unsigned long long +Storage::getDfSize(const string& mp) +{ unsigned long long ret = 0; struct statvfs64 fsbuf; if( statvfs64( mp.c_str(), &fsbuf )==0 ) @@ -5362,8 +5369,9 @@ y2war( "errno:" << errno << " " << strerror(errno)); } y2mil( "mp:" << mp << " ret:" << ret ); - return( ret ); - } + return ret; +} + bool Storage::getFreeInfo( const string& device, unsigned long long& resize_free, @@ -5779,7 +5787,7 @@ int -Storage::waitForDevice(const string& device) const +Storage::waitForDevice(const string& device) { int ret = 0; waitForDevice(); @@ -5803,22 +5811,6 @@ } -void Storage::checkDeviceExclusive( const string& device, unsigned secs ) -{ - const int delay = 50000; - const unsigned count = secs * 1000000/delay; - y2mil( "dev:" << device << " sec:" << secs << " count:" << count ); - for( unsigned i=0; i=0 ) - close(fd); - usleep( delay ); - } -} - - int Storage::zeroDevice(const string& device, unsigned long long sizeK, bool random, unsigned long long startK, unsigned long long endK) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Wed Apr 1 16:04:43 2009 @@ -241,11 +241,11 @@ bool setDmcryptData( const string& dev, const string& dm, unsigned dmnum, unsigned long long siz, storage::EncryptType typ ); - bool deletedDevice( const string& dev ); + bool deletedDevice(const string& dev) const; bool isDisk( const string& dev ); const Volume* getVolume( const string& dev ); unsigned long long deviceSize( const string& dev ); - string deviceByNumber( const string& majmin ); + string deviceByNumber(const string& majmin) const; void rootMounted(); bool isRootMounted() const { return( root_mounted ); } string findNormalDevice( const string& device ); @@ -382,7 +382,7 @@ unsigned long long& df_free, unsigned long long& used, bool& win, bool& efi, bool use_cache ); - unsigned long long getDfSize( const string& mp ); + static unsigned long long getDfSize(const string& mp); int createBackupState( const string& name ); int removeBackupState( const string& name ); int restoreBackupState( const string& name ); @@ -448,10 +448,10 @@ void eraseFreeInfo( const string& device ); static void waitForDevice(); - int waitForDevice(const string& device) const; - void checkDeviceExclusive( const string& device, unsigned secs ); - int zeroDevice(const string& device, unsigned long long sizeK, bool random = false, - unsigned long long beginK = 200, unsigned long long endK = 10); + static int waitForDevice(const string& device); + + static int zeroDevice(const string& device, unsigned long long sizeK, bool random = false, + unsigned long long beginK = 200, unsigned long long endK = 10); void getDiskList( bool (* CheckFnc)( const Disk& ), std::list& dl ); Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=56540&r1=56539&r2=56540&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Wed Apr 1 16:04:43 2009 @@ -708,7 +708,7 @@ } if( ret==0 && encryption!=ENC_NONE ) { - ret = cont->getStorage()->zeroDevice(mountDevice(), size_k, true); + ret = Storage::zeroDevice(mountDevice(), size_k, true); } if( ret==0 && mountDevice()!=dev && !cont->getStorage()->test() ) { @@ -1667,7 +1667,7 @@ string use_dev = dmcrypt_dev; if( c.retcode()==0 ) { - cont->getStorage()->waitForDevice( use_dev ); + Storage::waitForDevice(use_dev); updateFsData(); if( detected_fs!=FSUNKNOWN ) { @@ -1768,7 +1768,7 @@ unlink( fname.c_str() ); rmdir( cont->getStorage()->tmpDir().c_str() ); } - cont->getStorage()->waitForDevice( loop_dev ); + Storage::waitForDevice(loop_dev); } if( ret==0 ) { @@ -1890,7 +1890,7 @@ } unlink( fname.c_str() ); rmdir( cont->getStorage()->tmpDir().c_str() ); - cont->getStorage()->waitForDevice( dmcrypt_dev ); + Storage::waitForDevice(dmcrypt_dev); } if( ret==0 ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org