Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-09-17 21:23:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-09-10 17:02:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-09-17 21:23:45.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 16 13:16:50 CEST 2014 - [email protected] + +- fixed using DM disks for LVM (bnc#896729) +- 2.25.15 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.14.tar.bz2 New: ---- libstorage-2.25.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.ywdJvS/_old 2014-09-17 21:23:46.000000000 +0200 +++ /var/tmp/diff_new_pack.ywdJvS/_new 2014-09-17 21:23:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.14 +Version: 2.25.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.25.14.tar.bz2 -> libstorage-2.25.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/VERSION new/libstorage-2.25.15/VERSION --- old/libstorage-2.25.14/VERSION 2014-06-22 13:54:13.000000000 +0200 +++ new/libstorage-2.25.15/VERSION 2014-09-16 16:42:18.000000000 +0200 @@ -1 +1 @@ -2.25.14 +2.25.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/LvmVg.cc new/libstorage-2.25.15/storage/LvmVg.cc --- old/libstorage-2.25.14/storage/LvmVg.cc 2014-09-05 10:45:53.000000000 +0200 +++ new/libstorage-2.25.15/storage/LvmVg.cc 2014-09-16 16:42:18.000000000 +0200 @@ -446,14 +446,14 @@ return( ret ); } + int LvmVg::extendVg( const string& dev ) { - list<string> l; - l.push_back( dev ); - return( extendVg( l ) ); + return extendVg(list<string>({ dev })); } + int LvmVg::extendVg( const list<string>& devs ) { @@ -462,8 +462,6 @@ y2mil( "this:" << *this ); checkConsistency(); - list<string>::const_iterator i=devs.begin(); - list<Pv>::iterator p; if( readonly() ) { ret = LVM_CHANGE_READONLY; @@ -472,6 +470,9 @@ { ret = LVM_LIST_EMPTY; } + + list<string>::const_iterator i=devs.begin(); + list<Pv>::iterator p; while( ret==0 && i!=devs.end() ) { string d = normalizeDevice( *i ); @@ -508,7 +509,7 @@ { Pv pvn; unsigned long long s = getStorage()->deviceSize( d ); - pe = (s - 4000)/pe_size; + pe = s > 4000 ? (s - 4000) / pe_size : 0; pvn.num_pe = pvn.free_pe = pe; pvn.device = d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/Storage.cc new/libstorage-2.25.15/storage/Storage.cc --- old/libstorage-2.25.14/storage/Storage.cc 2014-09-09 17:23:28.000000000 +0200 +++ new/libstorage-2.25.15/storage/Storage.cc 2014-09-16 16:42:18.000000000 +0200 @@ -6518,18 +6518,30 @@ return( ret ); } -bool Storage::knownDevice( const string& dev, bool disks_allowed ) + + bool + Storage::knownDevice(const string& dev, bool disks_allowed) { - bool ret=true; - ConstVolIterator v; - if( !findVolume( dev, v ) ) - { - ret = disks_allowed && findDisk( dev )!=dEnd(); + bool ret = false; + ConstVolIterator v; + if (findVolume(dev, v)) + { + ret = true; + } + else if (disks_allowed) + { + if (findDisk(dev) != dEnd()) + ret = true; + else if (findDmPartCo(dev) != dmpCoEnd()) + ret = true; + else if (findMdPartCo(dev) != mdpCoEnd()) + ret = true; } - y2mil("dev:" << dev << " ret:" << ret); - return( ret ); + y2mil("dev:" << dev << " ret:" << ret); + return ret; } + bool Storage::setDmcryptData( const string& dev, const string& dm, unsigned dmnum, unsigned long long siz, storage::EncryptType typ ) @@ -6582,28 +6594,34 @@ return( ret ); } -bool Storage::canUseDevice( const string& dev, bool disks_allowed ) + + bool + Storage::canUseDevice(const string& dev, bool disks_allowed) { - bool ret=true; - ConstVolIterator v; - if( !findVolume( dev, v ) ) - { - if( disks_allowed ) - { - DiskIterator i = findDisk( dev ); - ret = i != dEnd() && !i->isUsedBy() && i->numPartitions() == 0; - } - else - ret = false; - } - else - { - ret = v->canUseDevice(); + bool ret = false; + ConstVolIterator v; + if (findVolume(dev, v)) + { + ret = v->canUseDevice(); + } + else if (disks_allowed) + { + ConstDiskIterator i1 = findDisk(dev); + ConstDmPartCoIterator i2 = findDmPartCo(dev); + ConstMdPartCoIterator i3 = findMdPartCo(dev); + + if (i1 != dEnd()) + ret = !i1->isUsedBy() && i1->numPartitions() == 0; + else if (i2 != dmpCoEnd()) + ret = !i2->isUsedBy() && i2->numPartitions() == 0; + else if (i3 != mdpCoEnd()) + ret = !i3->isUsedBy() && i3->numPartitions() == 0; } - y2mil("dev:" << dev << " ret:" << ret); - return( ret ); + y2mil("dev:" << dev << " ret:" << ret); + return ret; } + const Device* Storage::deviceByNumber( unsigned long maj, unsigned long min ) const { @@ -6629,20 +6647,31 @@ return ret; } -unsigned long long Storage::deviceSize( const string& dev ) + + unsigned long long + Storage::deviceSize(const string& dev) { - unsigned long long ret=0; - ConstVolIterator v; - if( !findVolume( dev, v ) ) + unsigned long long ret = 0; + ConstVolIterator v; + if (findVolume(dev, v)) { - DiskIterator i = findDisk( dev ); - if( i!=dEnd() ) - ret = i->sizeK(); + ret = v->sizeK(); } - else - ret = v->sizeK(); - y2mil("dev:" << dev << " ret:" << ret); - return( ret ); + else + { + ConstDiskIterator i1 = findDisk(dev); + ConstDmPartCoIterator i2 = findDmPartCo(dev); + ConstMdPartCoIterator i3 = findMdPartCo(dev); + + if (i1 != dEnd()) + ret = i1->sizeK(); + else if (i2 != dmpCoEnd()) + ret = i2->sizeK(); + else if (i3 != mdpCoEnd()) + ret = i3->sizeK(); + } + y2mil("dev:" << dev << " ret:" << ret); + return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/gen_md5sum.cc new/libstorage-2.25.15/storage/gen_md5sum.cc --- old/libstorage-2.25.14/storage/gen_md5sum.cc 2014-09-09 17:23:36.000000000 +0200 +++ new/libstorage-2.25.15/storage/gen_md5sum.cc 2014-09-16 16:43:35.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "9fbc6cde91f471eef5a92b261a690292" -#define SOURCES_MD5_DATE " Tue 9 Sep 17:23:36 CEST 2014 " +#define SOURCES_MD5SUM "2c7b22c16d38d390274f11a3a58c5234" +#define SOURCES_MD5_DATE " Tue 16 Sep 16:43:35 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
