Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv5158/linux/fs/partitions
Modified Files:
ldm.c ldm.h ldm_md.c
Log Message:
redo previous sweeping changes (typo)
calculate some memory stats
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -U2 -r1.76 -r1.77
--- ldm.c 17 Jun 2002 00:15:13 -0000 1.76
+++ ldm.c 17 Jun 2002 01:28:57 -0000 1.77
@@ -624,7 +624,7 @@
*/
#ifdef CONFIG_BLK_DEV_MD
-static struct vblk * ldm_find_vblk (const struct list *lh_vl, u64 id)
+static struct vblk * ldm_find_vblk (const struct list_head *lh_vl, u64 id)
{
- struct list *item;
+ struct list_head *item;
DEBUG_ON (!lh_vl);
@@ -654,5 +654,5 @@
static struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb)
{
- struct list *item;
+ struct list_head *item;
DEBUG_ON (!ldb);
@@ -722,5 +722,5 @@
unsigned long first_sector, int first_minor, const struct ldmdb *ldb)
{
- struct list *item;
+ struct list_head *item;
struct vblk_part *part;
struct vblk *disk;
@@ -1288,5 +1288,5 @@
{
struct vblk *vb;
- struct list *item;
+ struct list_head *item;
DEBUG_ON (!data || !ldb);
@@ -1346,8 +1346,8 @@
* FALSE Error, a problem occurred
*/
-static BOOL ldm_frag_add (const u8 *data, int size, struct list *frags)
+static BOOL ldm_frag_add (const u8 *data, int size, struct list_head *frags)
{
struct frag *f;
- struct list *item;
+ struct list_head *item;
int rec, num, group;
@@ -1406,7 +1406,7 @@
* Return: none
*/
-static void ldm_frag_free (struct list *list)
+static void ldm_frag_free (struct list_head *list)
{
- struct list *item, *tmp;
+ struct list_head *item, *tmp;
DEBUG_ON (!list);
@@ -1427,8 +1427,8 @@
* FALSE One or more of the fragments we invalid
*/
-static BOOL ldm_frag_commit (struct list *frags, struct ldmdb *ldb)
+static BOOL ldm_frag_commit (struct list_head *frags, struct ldmdb *ldb)
{
struct frag *f;
- struct list *item;
+ struct list_head *item;
BOOL result = FALSE;
@@ -1523,7 +1523,7 @@
* Return: none
*/
-static void ldm_free_vblks (struct list *lh)
+static void ldm_free_vblks (struct list_head *lh)
{
- struct list *item, *tmp;
+ struct list_head *item, *tmp;
DEBUG_ON (!lh);
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -U2 -r1.46 -r1.47
--- ldm.h 17 Jun 2002 00:15:13 -0000 1.46
+++ ldm.h 17 Jun 2002 01:28:57 -0000 1.47
@@ -112,5 +112,5 @@
/* VBLK Fragment handling */
struct frag {
- struct list list;
+ struct list_head list;
u32 group;
u8 num; /* Total number of records */
@@ -205,5 +205,5 @@
struct vblk_volu volu;
} vblk;
- struct list list;
+ struct list_head list;
};
@@ -212,9 +212,9 @@
struct tocblock toc;
struct vmdb vm;
- struct list v_dgrp;
- struct list v_disk;
- struct list v_volu;
- struct list v_comp;
- struct list v_part;
+ struct list_head v_dgrp;
+ struct list_head v_disk;
+ struct list_head v_volu;
+ struct list_head v_comp;
+ struct list_head v_part;
};
Index: ldm_md.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm_md.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- ldm_md.c 17 Jun 2002 00:15:13 -0000 1.7
+++ ldm_md.c 17 Jun 2002 01:28:57 -0000 1.8
@@ -80,5 +80,5 @@
// Entry in volume list
typedef struct {
- struct list list;
+ struct list_head list;
u8 dg_guid[16]; // diskgroup GUID
u32 objid; // volume id
@@ -168,5 +168,5 @@
u8 level, u8 parts, u8 chunk_s)
{
- struct list *item;
+ struct list_head *item;
_ldm_md_t* vol;
@@ -210,5 +210,5 @@
void ldm_md_destroy(void)
{
- struct list *item, *tmp;
+ struct list_head *item, *tmp;
list_for_each_safe (item, tmp, &_vols)
@@ -275,5 +275,5 @@
void ldm_md_flush(void)
{
- struct list *item, *tmp;
+ struct list_head *item, *tmp;
static int minor = CONFIG_LDM_MD_MINOR;
|
