[Ocfs2-tools-commits] mfasheh commits r466 - in trunk:
debugfs.ocfs2 debugfs.ocfs2/include fsck.ocfs2 libocfs2
libocfs2/include mkfs.ocfs2 mount.ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Dec 6 17:09:53 CST 2004
Author: mfasheh
Date: 2004-12-06 17:09:51 -0600 (Mon, 06 Dec 2004)
New Revision: 466
Modified:
trunk/debugfs.ocfs2/commands.c
trunk/debugfs.ocfs2/dump.c
trunk/debugfs.ocfs2/include/main.h
trunk/debugfs.ocfs2/readfs.c
trunk/fsck.ocfs2/util.c
trunk/libocfs2/checkhb.c
trunk/libocfs2/include/ocfs2_fs.h
trunk/mkfs.ocfs2/mkfs.c
trunk/mount.ocfs2/mount.ocfs2.c
Log:
* switch us to look for a system file called "heartbeat" instead of
"dlm" for dlm stuff.
* properly format the heartbeat system file.
Modified: trunk/debugfs.ocfs2/commands.c
===================================================================
--- trunk/debugfs.ocfs2/commands.c 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/debugfs.ocfs2/commands.c 2004-12-06 23:09:51 UTC (rev 466)
@@ -58,7 +58,7 @@
static void do_curdev (char **args);
static void do_super (char **args);
static void do_inode (char **args);
-static void do_dlm (char **args);
+static void do_hb (char **args);
static void do_journal (char **args);
static void do_group (char **args);
static void do_extent (char **args);
@@ -101,9 +101,9 @@
{ "show_inode_info", do_inode },
{ "stat", do_inode },
- { "nodes", do_dlm },
- { "publish", do_dlm },
- { "vote", do_dlm },
+ { "nodes", do_hb },
+ { "publish", do_hb },
+ { "vote", do_hb },
{ "logdump", do_journal },
@@ -336,13 +336,13 @@
free(gbls.curdir);
gbls.curdir = strdup("/");
- /* lookup dlm file */
+ /* lookup heartbeat file */
snprintf (sysfile, sizeof(sysfile),
- sysfile_info[DLM_SYSTEM_INODE].name);
+ sysfile_info[HEARTBEAT_SYSTEM_INODE].name);
ret = ocfs2_lookup(gbls.fs, gbls.sysdir_blkno, sysfile,
- strlen(sysfile), NULL, &gbls.dlm_blkno);
+ strlen(sysfile), NULL, &gbls.hb_blkno);
if (ret)
- gbls.dlm_blkno = 0;
+ gbls.hb_blkno = 0;
/* lookup journal files */
for (i = 0; i < sb->s_max_nodes; ++i) {
@@ -639,12 +639,12 @@
} /* do_inode */
/*
- * do_dlm()
+ * do_hb()
*
*/
-static void do_dlm (char **args)
+static void do_hb (char **args)
{
- char *dlmbuf = NULL;
+ char *hbbuf = NULL;
FILE *out;
int len;
errcode_t ret;
@@ -664,22 +664,22 @@
else
DBGFS_FATAL("internal");
- ret = ocfs2_read_whole_file(gbls.fs, gbls.dlm_blkno, &dlmbuf, &len);
+ ret = ocfs2_read_whole_file(gbls.fs, gbls.hb_blkno, &hbbuf, &len);
if (ret) {
- com_err(gbls.progname, ret, "while reading dlm file");
+ com_err(gbls.progname, ret, "while reading hb file");
goto bail;
}
out = open_pager();
- dump_func(out, dlmbuf);
+ dump_func(out, hbbuf);
close_pager(out);
bail:
- if (dlmbuf)
- ocfs2_free(&dlmbuf);
+ if (hbbuf)
+ ocfs2_free(&hbbuf);
return ;
-} /* do_dlm */
+} /* do_hb */
/*
* do_dump()
Modified: trunk/debugfs.ocfs2/dump.c
===================================================================
--- trunk/debugfs.ocfs2/dump.c 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/debugfs.ocfs2/dump.c 2004-12-06 23:09:51 UTC (rev 466)
@@ -134,8 +134,8 @@
g_string_append (flags, "Allocbitmap ");
if (in->i_flags & OCFS2_JOURNAL_FL)
g_string_append (flags, "Journal ");
- if (in->i_flags & OCFS2_DLM_FL)
- g_string_append (flags, "DLM ");
+ if (in->i_flags & OCFS2_HEARTBEAT_FL)
+ g_string_append (flags, "Heartbeat ");
if (in->i_flags & OCFS2_CHAIN_FL)
g_string_append (flags, "Chain ");
Modified: trunk/debugfs.ocfs2/include/main.h
===================================================================
--- trunk/debugfs.ocfs2/include/main.h 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/debugfs.ocfs2/include/main.h 2004-12-06 23:09:51 UTC (rev 466)
@@ -77,7 +77,7 @@
uint64_t max_blocks;
uint64_t root_blkno;
uint64_t sysdir_blkno;
- uint64_t dlm_blkno;
+ uint64_t hb_blkno;
uint64_t gblbm_blkno;
uint64_t jrnl_blkno[256];
} dbgfs_gbls;
Modified: trunk/debugfs.ocfs2/readfs.c
===================================================================
--- trunk/debugfs.ocfs2/readfs.c 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/debugfs.ocfs2/readfs.c 2004-12-06 23:09:51 UTC (rev 466)
@@ -264,7 +264,7 @@
ocfs2_dinode *inode;
struct ocfs2_dir_entry *rec;
GArray *dirarr = NULL;
- char *dlm = sysfile_info[DLM_SYSTEM_INODE].name;
+ char *hb = sysfile_info[HEARTBEAT_SYSTEM_INODE].name;
char *gblbm = sysfile_info[GLOBAL_BITMAP_SYSTEM_INODE].name;
unsigned int i, j;
char *journal[256];
@@ -292,8 +292,8 @@
for (i = 0; i < dirarr->len; ++i) {
rec = &(g_array_index(dirarr, struct ocfs2_dir_entry, i));
- if (!strncmp (rec->name, dlm, strlen(dlm))) {
- gbls.dlm_blkno = rec->inode;
+ if (!strncmp (rec->name, hb, strlen(hb))) {
+ gbls.hb_blkno = rec->inode;
continue;
}
if (!strncmp (rec->name, gblbm, strlen(gblbm))) {
Modified: trunk/fsck.ocfs2/util.c
===================================================================
--- trunk/fsck.ocfs2/util.c 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/fsck.ocfs2/util.c 2004-12-06 23:09:51 UTC (rev 466)
@@ -105,8 +105,8 @@
errcode_t o2fsck_read_publish(o2fsck_state *ost)
{
uint16_t i, max_nodes;
- char *dlm_buf = NULL;
- uint64_t dlm_ino;
+ char *hb_buf = NULL;
+ uint64_t hb_ino;
errcode_t ret;
int buflen;
char *whoami = "read_publish";
@@ -124,14 +124,14 @@
goto out;
}
- ret = ocfs2_lookup_system_inode(ost->ost_fs, DLM_SYSTEM_INODE,
- 0, &dlm_ino);
+ ret = ocfs2_lookup_system_inode(ost->ost_fs, HEARTBEAT_SYSTEM_INODE,
+ 0, &hb_ino);
if (ret) {
com_err(whoami, ret, "while looking up the dlm system inode");
goto out;
}
- ret = ocfs2_read_whole_file(ost->ost_fs, dlm_ino, &dlm_buf, &buflen);
+ ret = ocfs2_read_whole_file(ost->ost_fs, hb_ino, &hb_buf, &buflen);
if (ret) {
com_err(whoami, ret, "while reading dlm file");
goto out;
@@ -142,7 +142,7 @@
int b_bits = OCFS2_RAW_SB(ost->ost_fs->fs_super)->s_blocksize_bits;
memcpy(&ost->ost_publish[i],
- dlm_buf + ((2 + 4 + max_nodes + i) << b_bits),
+ hb_buf + ((2 + 4 + max_nodes + i) << b_bits),
sizeof(ocfs_publish));
if (ost->ost_publish[i].mounted)
ost->ost_stale_mounts = 1;
@@ -150,7 +150,7 @@
out:
if (ret && ost->ost_publish)
ocfs2_free(&ost->ost_publish);
- if (dlm_buf)
- ocfs2_free(&dlm_buf);
+ if (hb_buf)
+ ocfs2_free(&hb_buf);
return ret;
}
Modified: trunk/libocfs2/checkhb.c
===================================================================
--- trunk/libocfs2/checkhb.c 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/libocfs2/checkhb.c 2004-12-06 23:09:51 UTC (rev 466)
@@ -44,7 +44,7 @@
typedef struct _ocfs2_fs {
ocfs2_filesys *fs;
char *dev_name;
- uint64_t dlm_blkno;
+ uint64_t hb_blkno;
uint64_t *pub_times;
int *live_node;
struct list_head list;
@@ -352,7 +352,7 @@
int first_time)
{
ocfs2_filesys *fs = fs_blk->fs;
- char *dlm = sysfile_info[DLM_SYSTEM_INODE].name;
+ char *hb = sysfile_info[HEARTBEAT_SYSTEM_INODE].name;
char *buf = NULL;
int buflen = 0;
errcode_t ret = 0;
@@ -363,16 +363,16 @@
ocfs2_nodes *node_blk;
int i;
- /* get the dlm blkno */
- if (!fs_blk->dlm_blkno) {
- ret = ocfs2_lookup(fs, fs->fs_sysdir_blkno, dlm, strlen(dlm),
- NULL, &(fs_blk->dlm_blkno));
+ /* get the hb blkno */
+ if (!fs_blk->hb_blkno) {
+ ret = ocfs2_lookup(fs, fs->fs_sysdir_blkno, hb, strlen(hb),
+ NULL, &(fs_blk->hb_blkno));
if (ret)
goto bail;
}
- /* read dlm file */
- ret = ocfs2_read_whole_file(fs, fs_blk->dlm_blkno, &buf, &buflen);
+ /* read hb file */
+ ret = ocfs2_read_whole_file(fs, fs_blk->hb_blkno, &buf, &buflen);
if (ret)
goto bail;
Modified: trunk/libocfs2/include/ocfs2_fs.h
===================================================================
--- trunk/libocfs2/include/ocfs2_fs.h 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/libocfs2/include/ocfs2_fs.h 2004-12-06 23:09:51 UTC (rev 466)
@@ -93,7 +93,7 @@
#define OCFS2_LOCAL_ALLOC_FL (0x00000040) /* Node local alloc bitmap */
#define OCFS2_BITMAP_FL (0x00000080) /* Allocation bitmap */
#define OCFS2_JOURNAL_FL (0x00000100) /* Node journal */
-#define OCFS2_DLM_FL (0x00000200) /* DLM area */
+#define OCFS2_HEARTBEAT_FL (0x00000200) /* Heartbeat area */
#define OCFS2_CHAIN_FL (0x00000400) /* Chain allocator */
/*
@@ -133,7 +133,7 @@
GLOBAL_INODE_ALLOC_SYSTEM_INODE,
SLOT_MAP_SYSTEM_INODE,
#define OCFS2_FIRST_ONLINE_SYSTEM_INODE SLOT_MAP_SYSTEM_INODE
- DLM_SYSTEM_INODE,
+ HEARTBEAT_SYSTEM_INODE,
GLOBAL_BITMAP_SYSTEM_INODE,
ORPHAN_DIR_SYSTEM_INODE,
#define OCFS2_LAST_GLOBAL_SYSTEM_INODE ORPHAN_DIR_SYSTEM_INODE
@@ -152,7 +152,7 @@
/* These are used by the running filesystem */
[SLOT_MAP_SYSTEM_INODE] { "slot_map", 0, 0 },
- [DLM_SYSTEM_INODE] { "dlm", OCFS2_DLM_FL, 0 },
+ [HEARTBEAT_SYSTEM_INODE] { "heartbeat", OCFS2_HEARTBEAT_FL, 0 },
[GLOBAL_BITMAP_SYSTEM_INODE] { "global_bitmap", 0, 0 },
[ORPHAN_DIR_SYSTEM_INODE] { "orphan_dir", 0, 1 },
Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/mkfs.ocfs2/mkfs.c 2004-12-06 23:09:51 UTC (rev 466)
@@ -99,7 +99,7 @@
SFI_JOURNAL,
SFI_CLUSTER,
SFI_LOCAL_ALLOC,
- SFI_DLM,
+ SFI_HEARTBEAT,
SFI_CHAIN,
SFI_OTHER
};
@@ -276,7 +276,6 @@
static int initial_nodes_for_volume(uint64_t size);
static void generate_uuid(State *s);
static void create_generation(State *s);
-static void write_autoconfig_header(State *s, SystemFileDiskRecord *rec);
static void init_record(State *s, SystemFileDiskRecord *rec, int type, int dir);
static void print_state(State *s);
static int ocfs2_clusters_per_group(int block_size,
@@ -294,7 +293,7 @@
{ "bad_blocks", SFI_OTHER, 1, 0 },
{ "global_inode_alloc", SFI_CHAIN, 1, 0 },
{ "slot_map", SFI_OTHER, 1, 0 },
- { "dlm", SFI_DLM, 1, 0 },
+ { "heartbeat", SFI_HEARTBEAT, 1, 0 },
{ "global_bitmap", SFI_CLUSTER, 1, 0 },
{ "orphan_dir", SFI_OTHER, 1, 1 },
{ "extent_alloc:%04d", SFI_CHAIN, 0, 0 },
@@ -444,7 +443,7 @@
s->system_group->gd->bg_parent_dinode =
cpu_to_le64(tmprec->fe_off >> s->blocksize_bits);
- tmprec = &(record[DLM_SYSTEM_INODE][0]);
+ tmprec = &(record[HEARTBEAT_SYSTEM_INODE][0]);
need = (OCFS2_MAX_NODES + 1) << s->blocksize_bits;
alloc_bytes_from_bitmap(s, need, s->global_bm, &tmprec->extent_off, &tmprec->extent_len);
@@ -506,15 +505,10 @@
write_directory_data(s, system_dir);
write_directory_data(s, orphan_dir);
- if (!s->quiet)
- printf("done\n");
+ tmprec = &(record[HEARTBEAT_SYSTEM_INODE][0]);
+ write_metadata(s, tmprec, NULL);
if (!s->quiet)
- printf("Writing autoconfig header: ");
-
- write_autoconfig_header(s, &record[DLM_SYSTEM_INODE][0]);
-
- if (!s->quiet)
printf("done\n");
close_device(s);
@@ -1648,7 +1642,8 @@
buf = do_malloc(s, rec->extent_len);
memset(buf, 0, rec->extent_len);
- memcpy(buf, src, rec->file_size);
+ if (src)
+ memcpy(buf, src, rec->file_size);
do_pwrite(s, buf, rec->extent_len, rec->extent_off);
@@ -1865,24 +1860,6 @@
}
static void
-write_autoconfig_header(State *s, SystemFileDiskRecord *rec)
-{
- ocfs_node_config_hdr *hdr;
-
- hdr = do_malloc(s, s->blocksize);
- memset(hdr, 0, s->blocksize);
-
- strcpy(hdr->signature, OCFS2_NODE_CONFIG_HDR_SIGN);
- hdr->version = OCFS2_NODE_CONFIG_VER;
- hdr->num_nodes = 0;
- hdr->disk_lock.dl_master = -1;
- hdr->last_node = 0;
-
- do_pwrite(s, hdr, s->blocksize, rec->extent_off);
- free(hdr);
-}
-
-static void
init_record(State *s, SystemFileDiskRecord *rec, int type, int dir)
{
memset(rec, 0, sizeof(SystemFileDiskRecord));
@@ -1902,8 +1879,8 @@
case SFI_LOCAL_ALLOC:
rec->flags |= (OCFS2_BITMAP_FL|OCFS2_LOCAL_ALLOC_FL);
break;
- case SFI_DLM:
- rec->flags |= OCFS2_DLM_FL;
+ case SFI_HEARTBEAT:
+ rec->flags |= OCFS2_HEARTBEAT_FL;
break;
case SFI_CLUSTER:
rec->cluster_bitmap = 1;
Modified: trunk/mount.ocfs2/mount.ocfs2.c
===================================================================
--- trunk/mount.ocfs2/mount.ocfs2.c 2004-12-06 21:50:03 UTC (rev 465)
+++ trunk/mount.ocfs2/mount.ocfs2.c 2004-12-06 23:09:51 UTC (rev 466)
@@ -721,7 +721,7 @@
if (ret)
return status;
- heartbeat_filename = sysfile_info[DLM_SYSTEM_INODE].name;
+ heartbeat_filename = sysfile_info[HEARTBEAT_SYSTEM_INODE].name;
ret = ocfs2_lookup(fs, fs->fs_sysdir_blkno, heartbeat_filename,
strlen(heartbeat_filename), NULL, &blkno);
if (ret)
More information about the Ocfs2-tools-commits
mailing list