Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49706 - in /trunk/storage/libstorage/src: AppUtil.h Evms.cc Evms.h EvmsCo.cc EvmsCo.h StorageInterface.h
  • From: aschnell@xxxxxxxxxxxxxxxx
  • Date: Tue, 05 Aug 2008 12:19:39 -0000
  • Message-id: <20080805121940.0DDE639CA5@xxxxxxxxxxxxxxxx>
Author: aschnell
Date: Tue Aug 5 14:19:39 2008
New Revision: 49706

URL: http://svn.opensuse.org/viewcvs/yast?rev=49706&view=rev
Log:
- removed evms structs from StorageInterface.h

Modified:
trunk/storage/libstorage/src/AppUtil.h
trunk/storage/libstorage/src/Evms.cc
trunk/storage/libstorage/src/Evms.h
trunk/storage/libstorage/src/EvmsCo.cc
trunk/storage/libstorage/src/EvmsCo.h
trunk/storage/libstorage/src/StorageInterface.h

Modified: trunk/storage/libstorage/src/AppUtil.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/storage/libstorage/src/AppUtil.h (original)
+++ trunk/storage/libstorage/src/AppUtil.h Tue Aug 5 14:19:39 2008
@@ -96,8 +96,6 @@
return dngettext("storage", msgid, msgid_plural, n);
}

-#define IPC_PROJ_ID 7890
-
extern bool system_cmd_testmode;
extern const string app_ws;


Modified: trunk/storage/libstorage/src/Evms.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Evms.cc?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Evms.cc (original)
+++ trunk/storage/libstorage/src/Evms.cc Tue Aug 5 14:19:39 2008
@@ -265,16 +265,6 @@
return( txt );
}

-void Evms::getInfo( EvmsInfo& tinfo ) const
- {
- ((Volume*)this)->getInfo( info.v );
- info.stripe = stripe;
- info.stripe_size = stripe_size;
- info.compatible = compat;
- info.dm_table = tname;
- info.dm_target = target;
- tinfo = info;
- }

namespace storage
{

Modified: trunk/storage/libstorage/src/Evms.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Evms.h?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Evms.h (original)
+++ trunk/storage/libstorage/src/Evms.h Tue Aug 5 14:19:39 2008
@@ -25,7 +25,6 @@
string resizeText( bool doing ) const;

void updateMd();
- void getInfo(storage::EvmsInfo&) const;
bool equalContent( const Evms& rhs ) const;
void logDifference( const Evms& d ) const;
const EvmsCo* evmsCo() const;
@@ -38,7 +37,7 @@
static string getMapperName( const EvmsCo& d, const string& name );

bool compat;
- mutable storage::EvmsInfo info;
+
};

}

Modified: trunk/storage/libstorage/src/EvmsCo.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EvmsCo.cc?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/storage/libstorage/src/EvmsCo.cc (original)
+++ trunk/storage/libstorage/src/EvmsCo.cc Tue Aug 5 14:19:39 2008
@@ -1191,14 +1191,6 @@
}
if( ret )
{
- key_t k = ftok( EXEC_PATH, IPC_PROJ_ID );
- semid = semget( k, 1, IPC_CREAT|0600 );
- y2milestone( "ipc key:%x semid:%d", k, semid );
- if( semid<0 )
- {
- ret = false;
- y2error( "semget failed errno=%d (%s)", errno, strerror(errno)
);
- }
}
if( ret )
{
@@ -1858,48 +1850,6 @@

}

-void EvmsCo::getInfo( EvmsCoInfo& tinfo ) const
- {
- info.sizeK = sizeK();
- info.peSize = peSize();
- info.peCount = peCount();
- info.peFree = peFree();
- info.lvm2 = lvm2();
- info.create = created();
- info.uuid = uuid;
- info.realContainer = !nm.empty();
- info.devices.clear();
- list<Pv>::const_iterator i=pv.begin();
- while( i!=pv.end() )
- {
- if( !info.devices.empty() )
- info.devices += ' ';
- info.devices += i->device;
- ++i;
- }
- y2mil( "device:" << info.devices );
- info.devices_add.clear();
- i=pv_add.begin();
- while( i!=pv_add.end() )
- {
- if( !info.devices_add.empty() )
- info.devices_add += ' ';
- info.devices_add += i->device;
- ++i;
- }
- y2mil( "devices_add:" << info.devices_add );
- info.devices_rem.clear();
- i=pv_remove.begin();
- while( i!=pv_remove.end() )
- {
- if( !info.devices_rem.empty() )
- info.devices_rem += ' ';
- info.devices_rem += i->device;
- ++i;
- }
- y2mil( "devices_rem:" << info.devices_rem );
- tinfo = info;
- }

namespace storage
{

Modified: trunk/storage/libstorage/src/EvmsCo.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EvmsCo.h?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/storage/libstorage/src/EvmsCo.h (original)
+++ trunk/storage/libstorage/src/EvmsCo.h Tue Aug 5 14:19:39 2008
@@ -119,7 +119,6 @@
int resizeVolume( Volume* v, unsigned long long newSize );
int removeVolume( Volume* v );
void addVolume( Evms* v );
- void getInfo( storage::EvmsCoInfo& info ) const;
bool equalContent( const Container& rhs ) const;
void logDifference( const Container& d ) const;
bool checkConsistency() const;
@@ -224,7 +223,7 @@
bool valid;
static bool active;
static int sockfd;
- mutable storage::EvmsCoInfo info;
+
};

}

Modified: trunk/storage/libstorage/src/StorageInterface.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInterface.h?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/storage/libstorage/src/StorageInterface.h (original)
+++ trunk/storage/libstorage/src/StorageInterface.h Tue Aug 5 14:19:39 2008
@@ -214,25 +214,6 @@
};

/**
- * Contains info about a EVMS Container
- */
- struct EvmsCoInfo
- {
- EvmsCoInfo() {}
- unsigned long long sizeK;
- unsigned long long peSize;
- unsigned long peCount;
- unsigned long peFree;
- string uuid;
- bool lvm2;
- bool create;
- bool realContainer;
- string devices;
- string devices_add;
- string devices_rem;
- };
-
- /**
* Contains info about a DmPart disk
*/
struct DmPartCoInfo
@@ -330,20 +311,6 @@
};

/**
- * Contains info about a EVMS Volume.
- */
- struct EvmsInfo
- {
- EvmsInfo() {}
- VolumeInfo v;
- unsigned stripe;
- unsigned stripe_size;
- bool compatible;
- string dm_table;
- string dm_target;
- };
-
- /**
* Contains info about a software raid device.
*/
struct MdInfo

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages