Changes by: jkemi
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv3325/linux/fs/partitions
Modified Files:
ldm_md.c
Log Message:
ldm_md.c tab length 8
Index: ldm_md.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm_md.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- ldm_md.c 9 Feb 2002 13:43:05 -0000 1.4
+++ ldm_md.c 9 Feb 2002 18:52:40 -0000 1.5
@@ -31,5 +31,5 @@
#include <linux/list.h>
#include <linux/slab.h>
-#include "ldm.h" // Only for COMP_* defines
+#include "ldm.h" // For COMP_* defines
/****************
@@ -80,9 +80,9 @@
list_t list;
u8 dg_guid[16]; // diskgroup GUID
- u32 objid; // volume id
- u8 level; // RAID-level
- u8 parts; // number of parts in set
- u8 chunk_s; // size of chunks
- u8 added; // parts added
+ u32 objid; // volume id
+ u8 level; // RAID-level
+ u8 parts; // number of parts in set
+ u8 chunk_s; // size of chunks
+ u8 added; // parts added
kdev_t* kdevs; // array of devs for the whole set
} _ldm_md_t;
@@ -114,10 +114,11 @@
*/
static _ldm_md_t* _ldm_md_create(const u8* dg_guid, u32 objid,
- u8 level, u8 parts, u8 chunk_s)
+ u8 level, u8 parts, u8 chunk_s)
{
_ldm_md_t* vol;
int i;
- u8* ptr = (u8*)kmalloc(sizeof(_ldm_md_t)+sizeof(kdev_t)*parts, GFP_KERNEL);
+ u8* ptr = (u8*)kmalloc (
+ sizeof(_ldm_md_t) + sizeof(kdev_t) * parts, GFP_KERNEL);
if (!ptr) {
@@ -131,9 +132,9 @@
memcpy(vol->dg_guid, dg_guid, 16);
- vol->objid = objid;
- vol->level = level;
- vol->parts = parts;
- vol->chunk_s= chunk_s;
- vol->added = 0;
+ vol->objid = objid;
+ vol->level = level;
+ vol->parts = parts;
+ vol->chunk_s = chunk_s;
+ vol->added = 0;
// Mark all devs as unused
@@ -169,14 +170,18 @@
// Search the list for a match
- list_for_each(item, &_vols)
- {
+ list_for_each(item, &_vols) {
_ldm_md_t* t = list_entry(item, _ldm_md_t, list);
if (memcmp(t->dg_guid, dg_guid, 16) == 0 && t->objid == objid)
{
- if (t->level!=level || t->parts!=parts || t->chunk_s!=chunk_s) {
+ if (t->level != level ||
+ t->parts != parts ||
+ t->chunk_s != chunk_s) {
ldm_warn(LDM_MD_MSG_CORRUPT);
return 0;
}
- ldm_debug("id %u t %u n %u !FOUND!\n", objid, level, parts);
+
+ ldm_debug("id %u t %u n %u !FOUND!\n", objid,
+ level, parts);
+
return t;
}
@@ -184,7 +189,6 @@
// No match was found, create a new entry in list
- vol = _ldm_md_create(dg_guid, objid, level, parts, chunk_s);
-
- if (vol) ldm_debug("id %u t %u n %u !ADDED!\n", objid, level, parts);
+ if ((vol = _ldm_md_create(dg_guid, objid, level, parts, chunk_s)))
+ ldm_debug("id %u t %u n %u !ADDED!\n", objid, level, parts);
return vol;
@@ -206,6 +210,5 @@
list_t *item;
- for(item = _vols.next; item != &_vols; )
- {
+ for(item = _vols.next; item != &_vols; ) {
_ldm_md_t* v = list_entry(item, _ldm_md_t, list);
item = item->next;
@@ -275,15 +278,14 @@
// Scan for complete volumes
- list_for_each(item, &_vols)
- {
+ list_for_each(item, &_vols) {
_ldm_md_t* v = list_entry(item, _ldm_md_t, list);
- if (v->added == v->parts)
- {
+ if (v->added == v->parts) {
ldm_debug("Registering vol %u (parts: %d, type %d).\n",
- v->objid, v->parts, v->level);
+ v->objid, v->parts, v->level);
// Register to MD driver
- md_hook_add(minor++, v->level, v->chunk_s, v->parts, v->kdevs);
+ md_hook_add(minor++, v->level, v->chunk_s,
+ v->parts, v->kdevs);
// Free up memory and remove from list
|