|
From: Richard R. <fl...@us...> - 2002-06-17 00:15:16
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv1138/linux/fs/partitions
Modified Files:
ldm.c ldm.h ldm_md.c
Log Message:
reverted list_t following lkml thread
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -U2 -r1.75 -r1.76
--- ldm.c 20 Apr 2002 16:51:43 -0000 1.75
+++ ldm.c 17 Jun 2002 00:15:13 -0000 1.76
@@ -3,5 +3,5 @@
*
* Copyright (C) 2001,2002 Richard Russon <ld...@fl...>
- * Copyright (C) 2001 Anton Altaparmakov <an...@us...>
+ * Copyright (C) 2001 Anton Altaparmakov <ai...@ca...>
* Copyright (C) 2001,2002 Jakob Kemi <jak...@te...>
*
@@ -27,5 +27,5 @@
#include <linux/slab.h>
#include <linux/pagemap.h>
-#include <linux/stringify.h>
+//#include <linux/stringify.h>
#include "ldm.h"
#include "check.h"
@@ -624,7 +624,7 @@
*/
#ifdef CONFIG_BLK_DEV_MD
-static struct vblk * ldm_find_vblk (const list_t *lh_vl, u64 id)
+static struct vblk * ldm_find_vblk (const struct list *lh_vl, u64 id)
{
- list_t *item;
+ struct list *item;
DEBUG_ON (!lh_vl);
@@ -654,5 +654,5 @@
static struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb)
{
- list_t *item;
+ struct list *item;
DEBUG_ON (!ldb);
@@ -722,5 +722,5 @@
unsigned long first_sector, int first_minor, const struct ldmdb *ldb)
{
- list_t *item;
+ struct list *item;
struct vblk_part *part;
struct vblk *disk;
@@ -740,4 +740,6 @@
minor = first_minor;
+ printk (" [LDM]");
+
/* Create the data partitions */
list_for_each (item, &ldb->v_part) {
@@ -1286,5 +1288,5 @@
{
struct vblk *vb;
- list_t *item;
+ struct list *item;
DEBUG_ON (!data || !ldb);
@@ -1344,8 +1346,8 @@
* FALSE Error, a problem occurred
*/
-static BOOL ldm_frag_add (const u8 *data, int size, list_t *frags)
+static BOOL ldm_frag_add (const u8 *data, int size, struct list *frags)
{
struct frag *f;
- list_t *item;
+ struct list *item;
int rec, num, group;
@@ -1404,7 +1406,7 @@
* Return: none
*/
-static void ldm_frag_free (list_t *list)
+static void ldm_frag_free (struct list *list)
{
- list_t *item, *tmp;
+ struct list *item, *tmp;
DEBUG_ON (!list);
@@ -1425,8 +1427,8 @@
* FALSE One or more of the fragments we invalid
*/
-static BOOL ldm_frag_commit (list_t *frags, struct ldmdb *ldb)
+static BOOL ldm_frag_commit (struct list *frags, struct ldmdb *ldb)
{
struct frag *f;
- list_t *item;
+ struct list *item;
BOOL result = FALSE;
@@ -1521,7 +1523,7 @@
* Return: none
*/
-static void ldm_free_vblks (list_t *lh)
+static void ldm_free_vblks (struct list *lh)
{
- list_t *item, *tmp;
+ struct list *item, *tmp;
DEBUG_ON (!lh);
@@ -1582,8 +1584,4 @@
!ldm_validate_vmdb (bdev, base, ldb))
goto out;
-
- /* Create the LDM database device. */
- if (!ldm_create_partition (hd, first_minor++, base, ldb->ph.config_size))
- goto out;
/* Initialize vblk lists in ldmdb struct */
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -U2 -r1.45 -r1.46
--- ldm.h 20 Apr 2002 16:51:43 -0000 1.45
+++ ldm.h 17 Jun 2002 00:15:13 -0000 1.46
@@ -6,5 +6,5 @@
*
* Copyright (C) 2001,2002 Richard Russon <ld...@fl...>
- * Copyright (C) 2001 Anton Altaparmakov <an...@us...>
+ * Copyright (C) 2001 Anton Altaparmakov <ai...@ca...>
* Copyright (C) 2001,2002 Jakob Kemi <jak...@te...>
*
@@ -112,10 +112,10 @@
/* VBLK Fragment handling */
struct frag {
- list_t list;
- u32 group;
- u8 num; /* Total number of records */
- u8 rec; /* This is record number n */
- u8 map; /* Which portions are in use */
- u8 data[0];
+ struct list list;
+ u32 group;
+ u8 num; /* Total number of records */
+ u8 rec; /* This is record number n */
+ u8 map; /* Which portions are in use */
+ u8 data[0];
};
@@ -205,5 +205,5 @@
struct vblk_volu volu;
} vblk;
- list_t list;
+ struct list list;
};
@@ -212,9 +212,9 @@
struct tocblock toc;
struct vmdb vm;
- list_t v_dgrp;
- list_t v_disk;
- list_t v_volu;
- list_t v_comp;
- list_t v_part;
+ struct list v_dgrp;
+ struct list v_disk;
+ struct list v_volu;
+ struct list v_comp;
+ struct list v_part;
};
@@ -223,2 +223,3 @@
#endif /* _FS_PT_LDM_H_ */
+
Index: ldm_md.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm_md.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ldm_md.c 27 Feb 2002 17:40:20 -0000 1.6
+++ ldm_md.c 17 Jun 2002 00:15:13 -0000 1.7
@@ -80,12 +80,12 @@
// Entry in volume list
typedef struct {
- 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
- kdev_t* kdevs; // array of devs for the whole set
+ struct list 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
+ kdev_t* kdevs; // array of devs for the whole set
} _ldm_md_t;
@@ -168,5 +168,5 @@
u8 level, u8 parts, u8 chunk_s)
{
- list_t *item;
+ struct list *item;
_ldm_md_t* vol;
@@ -210,5 +210,5 @@
void ldm_md_destroy(void)
{
- list_t *item, *tmp;
+ struct list *item, *tmp;
list_for_each_safe (item, tmp, &_vols)
@@ -275,5 +275,5 @@
void ldm_md_flush(void)
{
- list_t *item, *tmp;
+ struct list *item, *tmp;
static int minor = CONFIG_LDM_MD_MINOR;
|
