This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 7cff23e49b7a80486e522fee5a645cd9b143c7c3 Author: Andrew Price anprice@redhat.com AuthorDate: Sat May 23 15:05:43 2020 +0100

mkfs.gfs2: Fix strncpy warnings

New in gcc 10

warning: ‘__builtin_strncpy’ specified bound 64 equals destination size [-Wstringop-truncation]

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/mkfs/main_mkfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index bb8762b..36fd08e 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -1144,8 +1144,8 @@ int main(int argc, char *argv[]) build_root(&sbd); sb.sb_root_dir = sbd.md.rooti->i_di.di_num;

- strncpy(sb.sb_lockproto, opts.lockproto, GFS2_LOCKNAME_LEN); - strncpy(sb.sb_locktable, opts.locktable, GFS2_LOCKNAME_LEN); + strncpy(sb.sb_lockproto, opts.lockproto, GFS2_LOCKNAME_LEN - 1); + strncpy(sb.sb_locktable, opts.locktable, GFS2_LOCKNAME_LEN - 1); sb.sb_lockproto[GFS2_LOCKNAME_LEN - 1] = '\0'; sb.sb_locktable[GFS2_LOCKNAME_LEN - 1] = '\0';

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 3896cbc482209d5e39a32674e240d74b171157ef Author: Andrew Price anprice@redhat.com AuthorDate: Sat May 23 21:30:57 2020 +0100

glocktop: Improve mount info handling

Using static arrays for the mount points causes glocktop to impose some arbitrary limits, like 80 chars for device and mount point paths. Improve on this situation by keeping the mount point info in a simple linked list and add some error handling in various places. Also remove a bunch of stale code from read_superblock. No more gfs2_buffer_heads in glocktop as a side effect.

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/glocktop/glocktop.c | 189 +++++++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 90 deletions(-)

diff --git a/gfs2/glocktop/glocktop.c b/gfs2/glocktop/glocktop.c index 2f74a7f..bd7fcf0 100644 --- a/gfs2/glocktop/glocktop.c +++ b/gfs2/glocktop/glocktop.c @@ -26,7 +26,6 @@

#define MAX_GLOCKS 20 #define MAX_LINES 6000 -#define MAX_MOUNT_POINTS 100 #define MAX_FILES 512 #define MAX_CALLTRACE_LINES 4 #define TITLE1 "glocktop - GFS2 glock monitor" @@ -144,7 +143,7 @@ enum summary_types { stypes = 7, };

-char debugfs[PATH_MAX]; +char *debugfs; int termcols = 80, termlines = 30, done = 0; unsigned glocks = 0; const char *termtype; @@ -152,10 +151,14 @@ WINDOW *wind; int bufsize = 4 * 1024 * 1024; char *glock[MAX_GLOCKS]; int iterations = 0, show_reservations = 0, iters_done = 0; -char devices[MAX_MOUNT_POINTS][80]; -char mount_points[MAX_MOUNT_POINTS][80]; -int fs_fd[MAX_MOUNT_POINTS]; -int mounted = 0; +struct mount_point { + struct mount_point *next; + char *device; + char *dir; + int fd; + struct gfs2_sb sb; +}; +struct mount_point *mounts; char dlmwlines[100][96]; /* waiters lines */ char dlmglines[MAX_LINES][97]; /* granted lines */ char contended_filenames[MAX_FILES][PATH_MAX]; @@ -165,11 +168,6 @@ int line = 0; const char *prog_name; char dlm_dirtbl_size[32], dlm_rsbtbl_size[32], dlm_lkbtbl_size[32]; int bsize = 0; -struct gfs2_sb sd_sb[MAX_MOUNT_POINTS]; -int sd_diptrs = 0, sd_inptrs = 0; -uint64_t sd_heightsize[GFS2_MAX_META_HEIGHT]; -uint64_t sd_jheightsize[GFS2_MAX_META_HEIGHT]; -int sd_max_height, sd_max_jheight; char print_dlm_grants = 1; char *gbuf = NULL; /* glocks buffer */ char *gpos = NULL; @@ -225,89 +223,104 @@ static void UpdateSize(int sig) signal(SIGWINCH, UpdateSize); }

-static void read_superblock(int fd, int mntpt) +static int read_superblock(int fd, struct gfs2_sb *sb) { - struct gfs2_sbd sbd = { .device_fd = fd, .bsize = GFS2_BASIC_BLOCK }; - struct gfs2_buffer_head *bh; - int x; - uint64_t space = 0; + ssize_t r; + char *buf;

ioctl(fd, BLKFLSBUF, 0); - bh = bread(&sbd, GFS2_SB_ADDR); - gfs2_sb_in(&sd_sb[mntpt], bh->b_data); - bsize = sd_sb[mntpt].sb_bsize; + buf = calloc(1, GFS2_BASIC_BLOCK); + if (buf == NULL) { + perror("Failed to read superblock"); + return -1; + } + r = pread(fd, buf, GFS2_BASIC_BLOCK, GFS2_BASIC_BLOCK * GFS2_SB_ADDR); + if (r != GFS2_BASIC_BLOCK) { + perror("Failed to read superblock"); + free(buf); + return -1; + } + gfs2_sb_in(sb, buf); + free(buf); + + bsize = sb->sb_bsize; if (!bsize) bsize = 4096; - sd_inptrs = (bsize - sizeof(struct gfs2_meta_header)) / - sizeof(uint64_t); - sd_diptrs = (bsize - sizeof(struct gfs2_dinode)) / - sizeof(uint64_t); - sd_heightsize[0] = bsize - sizeof(struct gfs2_dinode); - sd_heightsize[1] = bsize * sd_diptrs; - for (x = 2; ; x++) { - space = sd_heightsize[x - 1] * sd_inptrs; - if (space / sd_inptrs != sd_heightsize[x - 1] || - space % sd_inptrs != 0) - break; - sd_heightsize[x] = space; - } - sd_jheightsize[0] = bsize - sizeof(struct gfs2_dinode); - sd_jheightsize[1] = (bsize - sizeof(struct gfs2_meta_header)) * - sd_diptrs; - for (x = 2; ; x++){ - space = sd_jheightsize[x - 1] * sd_inptrs; - if (space / sd_inptrs != sd_jheightsize[x - 1] || - space % sd_inptrs != 0) - break; - sd_jheightsize[x] = space; + return 0; +} + +static void free_mounts(void) +{ + struct mount_point *mntp = mounts; + + while (mntp != NULL) { + struct mount_point *nextp = mntp->next; + + close(mntp->fd); + free(mntp); + mntp = nextp; } - sd_max_jheight = x; + mounts = NULL; }

static int parse_mounts(void) { - char str[PATH_MAX], dev[PATH_MAX], mnt[PATH_MAX], mtype[PATH_MAX]; - char opts[PATH_MAX]; + struct mount_point **mntp = &mounts; + struct mntent *mnt; FILE *fp;

- memset(debugfs, 0, sizeof(debugfs)); - memset(mount_points, 0, sizeof(mount_points)); - memset(devices, 0, sizeof(devices)); - - fp = fopen("/proc/mounts", "rt"); + fp = setmntent("/proc/mounts", "r"); if (fp == NULL) { perror("/proc/mounts"); return 1; } - while (fgets(str, sizeof(str) - 1, fp)) { - sscanf(str, "%s %s %s %s", dev, mnt, mtype, opts); - if (!strcmp(mtype, "debugfs")) { - strcpy(debugfs, mnt); + while ((mnt = getmntent(fp)) != NULL) { + size_t devlen = strlen(mnt->mnt_fsname); + size_t dirlen = strlen(mnt->mnt_dir); + struct mount_point *newmnt; + + if (strcmp(mnt->mnt_type, "debugfs") == 0) { + if (debugfs == NULL) + debugfs = strdup(mnt->mnt_dir); continue; } - if (strcmp(mtype, "gfs2")) /* if not gfs2 */ + if (strcmp(mnt->mnt_type, "gfs2") != 0) continue;

- strncpy(mount_points[mounted], mnt, 79); - mount_points[mounted][79] = '\0'; - strncpy(devices[mounted], dev, 79); - devices[mounted][79] = '\0'; - - /* Now find out the mount point's file system name */ - fs_fd[mounted] = open(dev, O_RDONLY); - if (fs_fd[mounted]) - read_superblock(fs_fd[mounted], mounted); - mounted++; + newmnt = calloc(1, sizeof(*newmnt) + devlen + 1 + dirlen + 1); + if (newmnt == NULL) { + perror("Failed to gather mount points"); + return 1; + } + newmnt->device = (char *)(newmnt + 1); + newmnt->dir = newmnt->device + devlen + 1; + strcpy(newmnt->device, mnt->mnt_fsname); + strcpy(newmnt->dir, mnt->mnt_dir); + newmnt->fd = open(newmnt->device, O_RDONLY); + + if (newmnt->fd < 0) { + fprintf(stderr, "Failed to open gfs2 filesystem '%s': %s\n", + newmnt->device, strerror(errno)); + free(newmnt); + continue; + } + if (read_superblock(newmnt->fd, &newmnt->sb) != 0) { + free(newmnt); + continue; + } + *mntp = newmnt; + mntp = &newmnt->next; } - if (debugfs[0] == '\0') { - if (mount("debugfs", "/sys/kernel/debug", "debugfs", 0, NULL)){ - fprintf(stderr, "Unable to mount debugfs.\n"); - fprintf(stderr, "Please mount it manually.\n"); - exit(-1); + endmntent(fp); + if (debugfs == NULL) { + debugfs = strdup("/sys/kernel/debug"); + if (!debugfs || mount("debugfs", "/sys/kernel/debug", "debugfs", 0, NULL)) { + perror("debugfs not mounted and an attempt to mount it failed"); + free(debugfs); + free_mounts(); + return 1; } - strcpy(debugfs, "/sys/kernel/debug"); } - fclose(fp); return 0; }

@@ -562,19 +575,17 @@ void print_it(const char *label, const char *fmt, const char *fmt2, ...) static void display_filename(int fd, unsigned long long block, unsigned long long dirarray[256], int subdepth) { + struct mount_point *mp; int i, subs; - char *mntpt = NULL; char blk[32]; DIR *dir = NULL; struct dirent *dent;

- for (i = 0; i < mounted; i++) { - if (fd == fs_fd[i]) { - mntpt = mount_points[i]; + for (mp = mounts; mp != NULL; mp = mp->next) { + if (fd == mp->fd) break; - } } - if (i == mounted) + if (mp == NULL) return; for (i = 0; i < contended_count; i++) { if (contended_blocks[i] == block) { @@ -584,7 +595,7 @@ static void display_filename(int fd, unsigned long long block, sprintf(blk, "%lld", block); if (i >= contended_count) { memset(contended_filenames[i], 0, PATH_MAX); - strcat(contended_filenames[i], mntpt); + strcat(contended_filenames[i], mp->dir); for (subs = subdepth - 2; subs >= 0; subs--) { dir = opendir(contended_filenames[i]); while ((dent = readdir(dir))) { @@ -655,26 +666,28 @@ static const char *show_inode(const char *id, int fd, unsigned long long block) static const char *show_details(const char *id, const char *fsname, int btype, int trace_dir_path) { - int mnt_num; unsigned long long block = 0; const char *blk_type = NULL; + struct mount_point *mp; FILE *dlmf;

/* Figure out which mount point corresponds to this debugfs id */ - for (mnt_num = 0; mnt_num < mounted; mnt_num++) { + for (mp = mounts; mp != NULL; mp = mp->next) { char *p;

- p = strchr(sd_sb[mnt_num].sb_locktable, ':'); + p = strchr(mp->sb.sb_locktable, ':'); if (!p) continue; p++; if (!strcmp(p, fsname)) break; } + if (mp == NULL) + return "unknown"; memset(dlm_dirtbl_size, 0, sizeof(dlm_dirtbl_size)); memset(dlm_rsbtbl_size, 0, sizeof(dlm_rsbtbl_size)); memset(dlm_lkbtbl_size, 0, sizeof(dlm_lkbtbl_size)); - if (!strcmp(sd_sb[mnt_num].sb_lockproto, "lock_dlm")) { + if (!strcmp(mp->sb.sb_lockproto, "lock_dlm")) { char *sp; char *p;

@@ -720,16 +733,12 @@ static const char *show_details(const char *id, const char *fsname, int btype, strcpy(dlm_lkbtbl_size, "nolock"); }

- if (mnt_num >= mounted) /* can't find the right superblock */ - return "unknown"; - /* Read the inode in so we can see its type. */ sscanf(id, "%llx", &block); if (block) { if (btype == 2) if (trace_dir_path) - blk_type = show_inode(id, fs_fd[mnt_num], - block); + blk_type = show_inode(id, mp->fd, block); else blk_type = ""; else @@ -1658,7 +1667,7 @@ int main(int argc, char **argv) int refresh_time = REFRESH_TIME; fd_set readfds; char string[96]; - int ch, i, dlmwaiters = 0, dlmgrants = 0; + int ch, dlmwaiters = 0, dlmgrants = 0; int cont = TRUE, optchar; int trace_dir_path = 0; int show_held = 1, help = 0; @@ -1894,10 +1903,10 @@ int main(int argc, char **argv) if (iterations && iters_done >= iterations) break; } - for (i = 0; i < mounted; i++) - close(fs_fd[i]); + free_mounts(); free(gbuf); free(dbuf); + free(debugfs); if (interactive) { refresh(); endwin();

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit a797986402143020ab974081ce1236e3912604e7 Author: Andrew Price anprice@redhat.com AuthorDate: Wed May 20 02:34:56 2020 +0100

libgfs2: Remove gfs2_buffer_head from gfs_dinode_in()

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/hexedit.h | 1 - gfs2/libgfs2/gfs1.c | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h index d2992d8..ab2d44d 100644 --- a/gfs2/edit/hexedit.h +++ b/gfs2/edit/hexedit.h @@ -227,7 +227,6 @@ extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf); extern void gfs_log_header_in(struct gfs_log_header *head, struct gfs2_buffer_head *bh); extern void gfs_log_header_print(struct gfs_log_header *lh); -extern void gfs_dinode_in(struct gfs_dinode *di, struct gfs2_buffer_head *bh); extern void savemeta(char *out_fn, int saveoption, int gziplevel); extern void restoremeta(const char *in_fn, const char *out_device, uint64_t printblocksonly); diff --git a/gfs2/libgfs2/gfs1.c b/gfs2/libgfs2/gfs1.c index 16c183b..7da2316 100644 --- a/gfs2/libgfs2/gfs1.c +++ b/gfs2/libgfs2/gfs1.c @@ -248,14 +248,11 @@ int gfs1_writei(struct gfs2_inode *ip, char *buf, uint64_t offset, return copied; }

-/* ------------------------------------------------------------------------ */ -/* gfs_dinode_in */ -/* ------------------------------------------------------------------------ */ -static void gfs_dinode_in(struct gfs_dinode *di, struct gfs2_buffer_head *bh) +static void gfs_dinode_in(struct gfs_dinode *di, char *buf) { - struct gfs_dinode *str = (struct gfs_dinode *)bh->b_data; + struct gfs_dinode *str = (struct gfs_dinode *)buf;

- gfs2_meta_header_in(&di->di_header, bh->b_data); + gfs2_meta_header_in(&di->di_header, buf); gfs2_inum_in(&di->di_num, (char *)&str->di_num);

di->di_mode = be32_to_cpu(str->di_mode); @@ -297,7 +294,7 @@ static struct gfs2_inode *__gfs_inode_get(struct gfs2_sbd *sdp, bh = bread(sdp, di_addr); ip->bh_owned = 1; } - gfs_dinode_in(&gfs1_dinode, bh); + gfs_dinode_in(&gfs1_dinode, bh->b_data); memcpy(&ip->i_di.di_header, &gfs1_dinode.di_header, sizeof(struct gfs2_meta_header)); memcpy(&ip->i_di.di_num, &gfs1_dinode.di_num,

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 1a35ac34b7ed69044101e2ed765906af06e50f4e Author: Andrew Price anprice@redhat.com AuthorDate: Wed May 20 03:17:26 2020 +0100

libgfs2: Remove gfs2_buffer_head from lgfs2_write_journal_data()

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/libgfs2/structures.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gfs2/libgfs2/structures.c b/gfs2/libgfs2/structures.c index 36e02c2..0aca7cd 100644 --- a/gfs2/libgfs2/structures.c +++ b/gfs2/libgfs2/structures.c @@ -156,41 +156,41 @@ int lgfs2_write_journal_data(struct gfs2_inode *ip) .lh_flags = GFS2_LOG_HEAD_UNMOUNT, #endif }; - struct gfs2_buffer_head *bh; struct gfs2_sbd *sdp = ip->i_sbd; unsigned blocks = (ip->i_di.di_size + sdp->bsize - 1) / sdp->bsize; uint64_t jext0 = ip->i_di.di_num.no_addr + ip->i_di.di_blocks - blocks; uint64_t seq = ((blocks) * (random() / (RAND_MAX + 1.0))); + uint64_t jblk = jext0; + char *buf;

- bh = bget(sdp, jext0); - if (bh == NULL) + buf = calloc(1, sdp->bsize); + if (buf == NULL) return -1;

crc32c_optimization_init(); do { - struct gfs2_log_header *buflh = (struct gfs2_log_header *)bh->b_data; + struct gfs2_log_header *buflh = (struct gfs2_log_header *)buf;

lh.lh_sequence = seq; - lh.lh_blkno = bh->b_blocknr - jext0; - gfs2_log_header_out(&lh, bh->b_data); + lh.lh_blkno = jblk - jext0; + gfs2_log_header_out(&lh, buf);

- buflh->lh_hash = cpu_to_be32(lgfs2_log_header_hash(bh->b_data)); + buflh->lh_hash = cpu_to_be32(lgfs2_log_header_hash(buf)); #ifdef GFS2_HAS_LH_V2 - buflh->lh_addr = cpu_to_be64(bh->b_blocknr); - buflh->lh_crc = cpu_to_be32(lgfs2_log_header_crc(bh->b_data, sdp->bsize)); + buflh->lh_addr = cpu_to_be64(jblk); + buflh->lh_crc = cpu_to_be32(lgfs2_log_header_crc(buf, sdp->bsize)); #endif - - if (bwrite(bh)) { - free(bh); + if (pwrite(sdp->device_fd, buf, sdp->bsize, jblk * sdp->bsize) != sdp->bsize) { + free(buf); return -1; }

if (++seq == blocks) seq = 0;

- } while (++bh->b_blocknr < jext0 + blocks); + } while (++jblk < jext0 + blocks);

- free(bh); + free(buf); return 0; }

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 6fd11e18efba1adb9b7b1b3f87d6a0e59e1a3737 Author: Andrew Price anprice@redhat.com AuthorDate: Thu May 21 01:37:59 2020 +0100

gfs2l: Remove uses of gfs2_buffer_heads

Required a similar treatment of lgfs2_get_block_type().

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/hexedit.c | 2 +- gfs2/edit/journal.c | 2 +- gfs2/libgfs2/buf.c | 4 +- gfs2/libgfs2/lang.c | 121 +++++++++++++++++++++++++++++-------------------- gfs2/libgfs2/lang.h | 2 +- gfs2/libgfs2/libgfs2.h | 2 +- 6 files changed, 78 insertions(+), 55 deletions(-)

diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index b31acd8..bc4bcc6 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -296,7 +296,7 @@ static void print_usage(void) /* ------------------------------------------------------------------------ */ uint32_t get_block_type(const struct gfs2_buffer_head *lbh, int *structlen) { - uint32_t ty = lgfs2_get_block_type(lbh); + uint32_t ty = lgfs2_get_block_type(lbh->b_data);

if (ty != 0 && structlen != NULL) { unsigned ver = sbd.gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2; diff --git a/gfs2/edit/journal.c b/gfs2/edit/journal.c index 9139855..06a5f61 100644 --- a/gfs2/edit/journal.c +++ b/gfs2/edit/journal.c @@ -231,7 +231,7 @@ static int print_ld_blks(const uint64_t *b, const char *end, int start_line, bcount); sprintf(str, "0x%llx %2s", (unsigned long long)be64_to_cpu(*b), - mtypes[lgfs2_get_block_type(j_bmap_bh)]); + mtypes[lgfs2_get_block_type(j_bmap_bh->b_data)]); brelse(j_bmap_bh); } else { sprintf(str, "0x%llx", diff --git a/gfs2/libgfs2/buf.c b/gfs2/libgfs2/buf.c index 097ac33..eb7a94c 100644 --- a/gfs2/libgfs2/buf.c +++ b/gfs2/libgfs2/buf.c @@ -118,9 +118,9 @@ int brelse(struct gfs2_buffer_head *bh) return error; }

-uint32_t lgfs2_get_block_type(const struct gfs2_buffer_head *lbh) +uint32_t lgfs2_get_block_type(const char *buf) { - const struct gfs2_meta_header *mh = lbh->iov.iov_base; + const struct gfs2_meta_header *mh = (void *)buf;

if (be32_to_cpu(mh->mh_magic) == GFS2_MAGIC) return be32_to_cpu(mh->mh_type); diff --git a/gfs2/libgfs2/lang.c b/gfs2/libgfs2/lang.c index 69a98aa..d48b123 100644 --- a/gfs2/libgfs2/lang.c +++ b/gfs2/libgfs2/lang.c @@ -2,6 +2,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <unistd.h> #include <sys/queue.h> #include <errno.h> #include <limits.h> @@ -286,15 +287,14 @@ static uint64_t ast_lookup_block_num(struct ast_node *ast, struct gfs2_sbd *sbd) return bn; }

-static struct gfs2_buffer_head *ast_lookup_block(struct ast_node *node, struct gfs2_sbd *sbd) +static uint64_t ast_lookup_block(struct ast_node *node, struct gfs2_sbd *sbd) { uint64_t bn = ast_lookup_block_num(node, sbd); if (bn == 0) { fprintf(stderr, "Block not found: %s\n", node->ast_text); - return NULL; + return 0; } - - return bread(sbd, bn); + return bn; }

static const char *bitstate_strings[] = { @@ -308,12 +308,12 @@ static const char *bitstate_strings[] = { * Print a representation of an arbitrary field of an arbitrary GFS2 block to stdout * Returns 0 if successful, 1 otherwise */ -static int field_print(const struct gfs2_buffer_head *bh, const struct lgfs2_metadata *mtype, +static int field_print(char *buf, uint64_t addr, const struct lgfs2_metadata *mtype, const struct lgfs2_metafield *field) { - const char *fieldp = (char *)bh->iov.iov_base + field->offset; + const char *fieldp = buf + field->offset;

- printf("%s\t%"PRIu64"\t%u\t%u\t%s\t", mtype->name, bh->b_blocknr, field->offset, field->length, field->name); + printf("%s\t%"PRIu64"\t%u\t%u\t%s\t", mtype->name, addr, field->offset, field->length, field->name); if (field->flags & LGFS2_MFF_UUID) { #ifdef GFS2_HAS_UUID char readable_uuid[36+1]; @@ -356,7 +356,8 @@ int lgfs2_lang_result_print(struct lgfs2_lang_result *result) int i; if (result->lr_mtype != NULL) { for (i = 0; i < result->lr_mtype->nfields; i++) { - field_print(result->lr_bh, result->lr_mtype, &result->lr_mtype->fields[i]); + field_print(result->lr_buf, result->lr_blocknr, + result->lr_mtype, &result->lr_mtype->fields[i]); } } else { printf("%"PRIu64": %s\n", result->lr_blocknr, bitstate_strings[result->lr_state]); @@ -390,21 +391,37 @@ static int ast_get_bitstate(uint64_t bn, struct gfs2_sbd *sbd) return state; }

-static const struct lgfs2_metadata *ast_lookup_mtype(const struct gfs2_buffer_head *bh) +static void result_lookup_mtype(struct lgfs2_lang_result *result, int gfs1) { - const struct lgfs2_metadata *mtype; - const uint32_t mh_type = lgfs2_get_block_type(bh); + const uint32_t mh_type = lgfs2_get_block_type(result->lr_buf); + uint64_t addr = result->lr_blocknr; + + result->lr_mtype = NULL; if (mh_type == 0) { - fprintf(stderr, "Could not determine type for block %"PRIu64"\n", bh->b_blocknr); - return NULL; + fprintf(stderr, "Could not determine type for block %"PRIu64"\n", addr); + return; } + result->lr_mtype = lgfs2_find_mtype(mh_type, gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2); + if (result->lr_mtype == NULL) + fprintf(stderr, "Could not determine meta type for block %"PRIu64"\n", addr); +} + +static char *lang_read_block(int fd, unsigned bsize, uint64_t addr) +{ + off_t off = addr * bsize; + char *buf;

- mtype = lgfs2_find_mtype(mh_type, bh->sdp->gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2); - if (mtype == NULL) { - fprintf(stderr, "Could not determine meta type for block %"PRIu64"\n", bh->b_blocknr); + buf = calloc(1, bsize); + if (buf == NULL) { + perror("Failed to read block"); return NULL; } - return mtype; + if (pread(fd, buf, bsize, off) != bsize) { + fprintf(stderr, "Failed to read block %"PRIu64": %s\n", addr, strerror(errno)); + free(buf); + return NULL; + } + return buf; }

/** @@ -420,13 +437,17 @@ static struct lgfs2_lang_result *ast_interp_get(struct lgfs2_lang_state *state, }

if (ast->ast_right->ast_right == NULL) { - result->lr_bh = ast_lookup_block(ast->ast_right, sbd); - if (result->lr_bh == NULL) { + result->lr_blocknr = ast_lookup_block(ast->ast_right, sbd); + if (result->lr_blocknr == 0) { free(result); return NULL; } - result->lr_blocknr = result->lr_bh->b_blocknr; - result->lr_mtype = ast_lookup_mtype(result->lr_bh); + result->lr_buf = lang_read_block(sbd->device_fd, sbd->bsize, result->lr_blocknr); + if (result->lr_buf == NULL) { + free(result); + return NULL; + } + result_lookup_mtype(result, sbd->gfs1);

} else if (ast->ast_right->ast_right->ast_type == AST_KW_STATE) { result->lr_blocknr = ast_lookup_block_num(ast->ast_right, sbd); @@ -444,8 +465,8 @@ static struct lgfs2_lang_result *ast_interp_get(struct lgfs2_lang_state *state, * Set a field of a gfs2 block of a given type to a given value. * Returns AST_INTERP_* to signal success, an invalid field/value or an error. */ -static int ast_field_set(struct gfs2_buffer_head *bh, const struct lgfs2_metafield *field, - struct ast_node *val) +static int ast_field_set(char *buf, const struct lgfs2_metafield *field, + struct ast_node *val) { int err = 0;

@@ -457,15 +478,15 @@ static int ast_field_set(struct gfs2_buffer_head *bh, const struct lgfs2_metafie fprintf(stderr, "Invalid UUID\n"); return AST_INTERP_INVAL; } - err = lgfs2_field_assign(bh->b_data, field, uuid); + err = lgfs2_field_assign(buf, field, uuid); #else fprintf(stderr, "No UUID support\n"); err = 1; #endif } else if (field->flags & LGFS2_MFF_STRING) { - err = lgfs2_field_assign(bh->b_data, field, val->ast_str); + err = lgfs2_field_assign(buf, field, val->ast_str); } else { - err = lgfs2_field_assign(bh->b_data, field, &val->ast_num); + err = lgfs2_field_assign(buf, field, &val->ast_num); }

if (err) { @@ -473,12 +494,10 @@ static int ast_field_set(struct gfs2_buffer_head *bh, const struct lgfs2_metafie field->name, field->length, val->ast_text); return AST_INTERP_INVAL; } - - bmodified(bh); return AST_INTERP_SUCCESS; }

-static const struct lgfs2_metadata *lang_find_mtype(struct ast_node *node, struct gfs2_buffer_head *bh, unsigned ver) +static const struct lgfs2_metadata *lang_find_mtype(struct ast_node *node, const char *buf, unsigned ver) { const struct lgfs2_metadata *mtype = NULL;

@@ -487,7 +506,7 @@ static const struct lgfs2_metadata *lang_find_mtype(struct ast_node *node, struc if (mtype == NULL) fprintf(stderr, "Invalid block type: %s\n", node->ast_text); } else { - mtype = lgfs2_find_mtype(lgfs2_get_block_type(bh), ver); + mtype = lgfs2_find_mtype(lgfs2_get_block_type(buf), ver); if (mtype == NULL) fprintf(stderr, "Unrecognised block at: %s\n", node->ast_text); } @@ -495,6 +514,18 @@ static const struct lgfs2_metadata *lang_find_mtype(struct ast_node *node, struc return mtype; }

+static int lang_write_result(int fd, unsigned bsize, struct lgfs2_lang_result *result) +{ + off_t off = bsize * result->lr_blocknr; + + if (pwrite(fd, result->lr_buf, bsize, off) != bsize) { + fprintf(stderr, "Failed to write modified block %"PRIu64": %s\n", + result->lr_blocknr, strerror(errno)); + return -1; + } + return 0; +} + /** * Interpret an assignment (set) */ @@ -514,12 +545,14 @@ static struct lgfs2_lang_result *ast_interp_set(struct lgfs2_lang_state *state, return NULL; }

- result->lr_bh = ast_lookup_block(lookup, sbd); - if (result->lr_bh == NULL) { + result->lr_blocknr = ast_lookup_block(lookup, sbd); + if (result->lr_blocknr == 0) + goto out_err; + result->lr_buf = lang_read_block(sbd->device_fd, sbd->bsize, result->lr_blocknr); + if (result->lr_buf == NULL) goto out_err; - }

- result->lr_mtype = lang_find_mtype(lookup->ast_right, result->lr_bh, ver); + result->lr_mtype = lang_find_mtype(lookup->ast_right, result->lr_buf, ver); if (result->lr_mtype == NULL) { fprintf(stderr, "Unrecognised block at: %s\n", lookup->ast_str); goto out_err; @@ -531,7 +564,7 @@ static struct lgfs2_lang_result *ast_interp_set(struct lgfs2_lang_state *state, .mh_type = result->lr_mtype->mh_type, .mh_format = result->lr_mtype->mh_format, }; - gfs2_meta_header_out(&mh, result->lr_bh->iov.iov_base); + gfs2_meta_header_out(&mh, result->lr_buf); lookup = lookup->ast_right; }

@@ -550,21 +583,17 @@ static struct lgfs2_lang_result *ast_interp_set(struct lgfs2_lang_state *state, goto out_err; }

- ret = ast_field_set(result->lr_bh, mfield, fieldval); + ret = ast_field_set(result->lr_buf, mfield, fieldval); if (ret != AST_INTERP_SUCCESS) { goto out_err; } }

- ret = bwrite(result->lr_bh); - if (ret != 0) { - fprintf(stderr, "Failed to write modified block %"PRIu64": %s\n", - result->lr_bh->b_blocknr, strerror(errno)); + ret = lang_write_result(sbd->device_fd, sbd->bsize, result); + if (ret != 0) goto out_err; - }

return result; - out_err: lgfs2_lang_result_free(&result); return NULL; @@ -606,13 +635,7 @@ void lgfs2_lang_result_free(struct lgfs2_lang_result **result) fprintf(stderr, "Warning: attempted to free a null result\n"); return; } - - if ((*result)->lr_mtype != NULL) { - (*result)->lr_bh->b_modified = 0; - brelse((*result)->lr_bh); - (*result)->lr_bh = NULL; - } - + free((*result)->lr_buf); free(*result); *result = NULL; } diff --git a/gfs2/libgfs2/lang.h b/gfs2/libgfs2/lang.h index f74a57b..211abd4 100644 --- a/gfs2/libgfs2/lang.h +++ b/gfs2/libgfs2/lang.h @@ -14,7 +14,7 @@ struct lgfs2_lang_state {

struct lgfs2_lang_result { uint64_t lr_blocknr; - struct gfs2_buffer_head *lr_bh; + char *lr_buf; const struct lgfs2_metadata *lr_mtype; int lr_state; // GFS2_BLKST_* }; diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index aa500df..7ede196 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -369,7 +369,7 @@ extern struct gfs2_buffer_head *__bread(struct gfs2_sbd *sdp, uint64_t num, extern int __breadm(struct gfs2_sbd *sdp, struct gfs2_buffer_head **bhs, size_t n, uint64_t block, int line, const char *caller); extern int bwrite(struct gfs2_buffer_head *bh); extern int brelse(struct gfs2_buffer_head *bh); -extern uint32_t lgfs2_get_block_type(const struct gfs2_buffer_head *lbh); +extern uint32_t lgfs2_get_block_type(const char *buf);

#define bmodified(bh) do { bh->b_modified = 1; } while(0)

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit b5a1e861485e43fe68edef9e11c16f069ebd0606 Author: Andrew Price anprice@redhat.com AuthorDate: Thu May 21 22:24:42 2020 +0100

gfs2_edit: Don't use gfs2_buffer_head in do_dinode_extended() args

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/gfs2hex.c | 15 +++++++-------- gfs2/edit/gfs2hex.h | 3 +-- gfs2/edit/hexedit.c | 4 ++-- gfs2/edit/journal.c | 2 +- gfs2/edit/savemeta.c | 4 ++-- 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c index 62d5cab..ea9b6d3 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -236,7 +236,7 @@ static int indirect_dirent(struct indirect_info *indir, char *ptr, int d) return de.de_rec_len; }

-void do_dinode_extended(struct gfs2_dinode *dine, struct gfs2_buffer_head *lbh) +void do_dinode_extended(struct gfs2_dinode *dine, char *buf) { unsigned int x, y, ptroff = 0; uint64_t p, last; @@ -249,7 +249,7 @@ void do_dinode_extended(struct gfs2_dinode *dine, struct gfs2_buffer_head *lbh) /* Indirect pointers */ for (x = sizeof(struct gfs2_dinode); x < sbd.bsize; x += sizeof(uint64_t)) { - p = be64_to_cpu(*(uint64_t *)(lbh->b_data + x)); + p = be64_to_cpu(*(uint64_t *)(buf + x)); if (p) { indirect->ii[indirect_blocks].block = p; indirect->ii[indirect_blocks].mp.mp_list[0] = @@ -270,7 +270,7 @@ void do_dinode_extended(struct gfs2_dinode *dine, struct gfs2_buffer_head *lbh) indirect->ii[0].block = block; indirect->ii[0].is_dir = TRUE; for (x = sizeof(struct gfs2_dinode); x < sbd.bsize; x += skip) { - skip = indirect_dirent(indirect->ii, lbh->b_data + x, + skip = indirect_dirent(indirect->ii, buf + x, indirect->ii[0].dirents); if (skip <= 0) break; @@ -280,14 +280,13 @@ void do_dinode_extended(struct gfs2_dinode *dine, struct gfs2_buffer_head *lbh) (dine->di_flags & GFS2_DIF_EXHASH) && dine->di_height == 0) { /* Leaf Pointers: */ - - last = be64_to_cpu(*(uint64_t *)(lbh->b_data + - sizeof(struct gfs2_dinode))); - + + last = be64_to_cpu(*(uint64_t *)(buf + sizeof(struct gfs2_dinode))); + for (x = sizeof(struct gfs2_dinode), y = 0; y < (1 << dine->di_depth); x += sizeof(uint64_t), y++) { - p = be64_to_cpu(*(uint64_t *)(lbh->b_data + x)); + p = be64_to_cpu(*(uint64_t *)(buf + x));

if (p != last || ((y + 1) * sizeof(uint64_t) == dine->di_size)) { struct gfs2_buffer_head *tmp_bh; diff --git a/gfs2/edit/gfs2hex.h b/gfs2/edit/gfs2hex.h index c3efb27..6c6ddde 100644 --- a/gfs2/edit/gfs2hex.h +++ b/gfs2/edit/gfs2hex.h @@ -5,8 +5,7 @@

extern int display_gfs2(struct gfs2_buffer_head *dbh); extern int edit_gfs2(void); -extern void do_dinode_extended(struct gfs2_dinode *di, - struct gfs2_buffer_head *lbh); +extern void do_dinode_extended(struct gfs2_dinode *di, char *buf); extern void print_gfs2(const char *fmt, ...) __attribute__((format (printf, 1, 2))); extern uint64_t do_leaf_extended(char *dlebuf, struct iinfo *indir); extern void eol(int col); diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index bc4bcc6..8a8e022 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1057,7 +1057,7 @@ static int read_master_dir(void) if (bh == NULL) return 1; gfs2_dinode_in(&di, bh->b_data); - do_dinode_extended(&di, bh); /* get extended data, if any */ + do_dinode_extended(&di, bh->b_data); /* get extended data, if any */ memcpy(&masterdir, &indirect[0], sizeof(struct indirect_info)); return 0; } @@ -1128,7 +1128,7 @@ int display(int identify_only, int trunc_zeros, uint64_t flagref, } else if (gfs2_struct_type == GFS2_METATYPE_DI) { gfs2_dinode_in(&di, bh->b_data); - do_dinode_extended(&di, bh); /* get extended data, if any */ + do_dinode_extended(&di, bh->b_data); /* get extended data, if any */ } else if (gfs2_struct_type == GFS2_METATYPE_IN) { /* indirect block list */ if (blockhist) { diff --git a/gfs2/edit/journal.c b/gfs2/edit/journal.c index 06a5f61..aa94592 100644 --- a/gfs2/edit/journal.c +++ b/gfs2/edit/journal.c @@ -57,7 +57,7 @@ uint64_t find_journal_block(const char *journal, uint64_t *j_size) gfs2_dinode_in(&di, jindex_bh->b_data);

if (!sbd.gfs1) - do_dinode_extended(&di, jindex_bh); /* parse dir. */ + do_dinode_extended(&di, jindex_bh->b_data); /* parse dir. */

if (sbd.gfs1) { struct gfs2_inode *jiinode; diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index cbecf28..c42f2da 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -274,7 +274,7 @@ static int init_per_node_lookup(void) return 1; }

- do_dinode_extended(&per_node_di->i_di, per_node_di->i_bh); + do_dinode_extended(&per_node_di->i_di, per_node_di->i_bh->b_data); inode_put(&per_node_di);

for (i = 0; i < indirect_blocks; i++) { @@ -993,7 +993,7 @@ void savemeta(char *out_fn, int saveoption, int gziplevel) lbh = bread(&sbd, jindex_block); gfs2_dinode_in(&di, lbh->b_data); if (!sbd.gfs1) - do_dinode_extended(&di, lbh); + do_dinode_extended(&di, lbh->b_data); brelse(lbh);

printf("Filesystem size: %.2fGB\n", (sbd.fssize * sbd.bsize) / ((float)(1 << 30)));

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit bc9d8801ad86362c83268115f9cde880e5788a12 Author: Andrew Price anprice@redhat.com AuthorDate: Sat May 23 12:27:28 2020 +0100

gfs2_edit: get_block_type() improvements

Use the metadata description better to clean up the interface to get_block_type() and remove the use of gfs2_buffer_head there. Since we already have the structure length in mtype->size there's no need to set it separately, just return the metadata type structure instead of the mh_type. Use the new ->display strings to simplify display_block_type().

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/gfs2hex.c | 2 +- gfs2/edit/hexedit.c | 147 ++++++++++++++-------------------------------------- gfs2/edit/hexedit.h | 6 +-- gfs2/edit/journal.c | 55 +++++++++++--------- 4 files changed, 72 insertions(+), 138 deletions(-)

diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c index ea9b6d3..7274303 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -526,7 +526,7 @@ int display_gfs2(struct gfs2_buffer_head *dbh)

case GFS2_METATYPE_LH: if (sbd.gfs1) { - gfs_log_header_in(&lh1, dbh); + gfs_log_header_in(&lh1, dbh->b_data); gfs_log_header_print(&lh1); } else { gfs2_log_header_in(&lh, dbh->b_data); diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 8a8e022..357e790 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -289,24 +289,13 @@ static void print_usage(void) Erase(); }

-/* ------------------------------------------------------------------------ */ -/* get_block_type */ -/* returns: metatype if block is a GFS2 structure block type */ -/* 0 if block is not a GFS2 structure */ -/* ------------------------------------------------------------------------ */ -uint32_t get_block_type(const struct gfs2_buffer_head *lbh, int *structlen) +const struct lgfs2_metadata *get_block_type(char *buf) { - uint32_t ty = lgfs2_get_block_type(lbh->b_data); + uint32_t t = lgfs2_get_block_type(buf);

- if (ty != 0 && structlen != NULL) { - unsigned ver = sbd.gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2; - const struct lgfs2_metadata *mtype = lgfs2_find_mtype(ty, ver); - if (mtype != NULL) - *structlen = mtype->size; - else - *structlen = sbd.bsize; - } - return ty; + if (t != 0) + return lgfs2_find_mtype(t, sbd.gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2); + return NULL; }

/* ------------------------------------------------------------------------ */ @@ -316,6 +305,7 @@ uint32_t get_block_type(const struct gfs2_buffer_head *lbh, int *structlen) /* ------------------------------------------------------------------------ */ int display_block_type(struct gfs2_buffer_head *dbh, int from_restore) { + const struct lgfs2_metadata *mtype; const struct gfs2_meta_header *mh; int ret_type = 0; /* return type */

@@ -350,53 +340,14 @@ int display_block_type(struct gfs2_buffer_head *dbh, int from_restore) ret_type = GFS2_METATYPE_DI; struct_len = 0; } else { - ret_type = get_block_type(dbh, &struct_len); - switch (ret_type) { - case GFS2_METATYPE_SB: /* 1 */ - print_gfs2("(superblock)"); - break; - case GFS2_METATYPE_RG: /* 2 */ - print_gfs2("(rsrc grp hdr)"); - break; - case GFS2_METATYPE_RB: /* 3 */ - print_gfs2("(rsrc grp bitblk)"); - break; - case GFS2_METATYPE_DI: /* 4 */ - print_gfs2("(disk inode)"); - break; - case GFS2_METATYPE_IN: /* 5 */ - print_gfs2("(indir blklist)"); - break; - case GFS2_METATYPE_LF: /* 6 */ - print_gfs2("(directory leaf)"); - break; - case GFS2_METATYPE_JD: - print_gfs2("(journal data)"); - break; - case GFS2_METATYPE_LH: - print_gfs2("(log header)"); - break; - case GFS2_METATYPE_LD: - print_gfs2("(log descriptor)"); - break; - case GFS2_METATYPE_EA: - print_gfs2("(extended attr hdr)"); - break; - case GFS2_METATYPE_ED: - print_gfs2("(extended attr data)"); - break; - case GFS2_METATYPE_LB: - print_gfs2("(log buffer)"); - break; - case GFS2_METATYPE_QC: - print_gfs2("(quota change)"); - break; - case 0: + mtype = get_block_type(dbh->b_data); + if (mtype != NULL) { + print_gfs2("(%s)", mtype->display); + struct_len = mtype->size; + ret_type = mtype->mh_type; + } else { struct_len = sbd.bsize; - break; - default: - print_gfs2("(wtf?)"); - break; + ret_type = 0; } } mh = dbh->iov.iov_base; @@ -531,20 +482,6 @@ int display_block_type(struct gfs2_buffer_head *dbh, int from_restore) return ret_type; }

-static const struct lgfs2_metadata *find_mtype(uint32_t mtype, const unsigned versions) -{ - const struct lgfs2_metadata *m = lgfs2_metadata; - unsigned n = 0; - - do { - if ((m[n].versions & versions) && m[n].mh_type == mtype) - return &m[n]; - n++; - } while (n < lgfs2_metadata_size); - - return NULL; -} - static int get_pnum(int ptroffset) { int pnum; @@ -568,7 +505,7 @@ static int hexdump(uint64_t startaddr, int len, int trunc_zeros, const char *lpBuffer = bh->b_data; const char *zeros_strt = lpBuffer + sbd.bsize; int print_field, cursor_line; - const uint32_t block_type = get_block_type(bh, NULL); + const struct lgfs2_metadata *m = get_block_type(bh->b_data); uint64_t *ref; int ptroffset = 0;

@@ -673,8 +610,6 @@ static int hexdump(uint64_t startaddr, int len, int trunc_zeros, } print_gfs2("] "); if (print_field >= 0) { - const struct lgfs2_metadata *m = find_mtype(block_type, - sbd.gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2); if (m) { const struct lgfs2_metafield *f; unsigned n; @@ -689,7 +624,9 @@ static int hexdump(uint64_t startaddr, int len, int trunc_zeros, }

} - if (cursor_line) { + if (m && cursor_line) { + const uint32_t block_type = m->mh_type; + if (block_type == GFS2_METATYPE_IN || block_type == GFS2_METATYPE_LD || ((block_type == GFS2_METATYPE_DI) && @@ -723,7 +660,7 @@ static int hexdump(uint64_t startaddr, int len, int trunc_zeros, if ((const char *)pointer >= zeros_strt) break; } /* while */ - if (block_type == GFS2_METATYPE_LD && ptroffset >= struct_len) { + if (m && m->mh_type == GFS2_METATYPE_LD && ptroffset >= struct_len) { COLORS_NORMAL; eol(0); print_gfs2(" * 'j' will jump to the journaled block, " @@ -1637,8 +1574,12 @@ static void jump(void) if (dmode == HEX_MODE) { unsigned int col2; uint64_t *b; - const uint32_t block_type = get_block_type(bh, NULL); - + const struct lgfs2_metadata *mtype = get_block_type(bh->b_data); + uint32_t block_type = 0; + + if (mtype != NULL) + block_type = mtype->mh_type; + /* special exception for log descriptors: jump the journaled version of the block, not the "real" block */ if (block_type == GFS2_METATYPE_LD) { @@ -1667,33 +1608,26 @@ static void jump(void) } }

-/* ------------------------------------------------------------------------ */ -/* print block type */ -/* ------------------------------------------------------------------------ */ -static void print_block_type(uint64_t tblock, int type, const char *additional) +static void print_block_type(uint64_t tblock, const struct lgfs2_metadata *type) { - if (type <= GFS2_METATYPE_QC) - printf("%d (Block %lld is type %d: %s%s)\n", type, - (unsigned long long)tblock, type, block_type_str[type], - additional); + if (type != NULL && type->nfields > 0) + printf("%d (Block %"PRIu64" is type %d: %s)\n", type->mh_type, + tblock, type->mh_type, type->display); else - printf("%d (Block %lld is type %d: unknown%s)\n", type, - (unsigned long long)tblock, type, additional); + printf("%d (Block %"PRIu64" is type %d: unknown)\n", type->mh_type, + tblock, type->mh_type); }

-/* ------------------------------------------------------------------------ */ -/* find_print block type */ -/* ------------------------------------------------------------------------ */ static void find_print_block_type(void) { uint64_t tblock; struct gfs2_buffer_head *lbh; - int type; + const struct lgfs2_metadata *type;

tblock = blockstack[blockhist % BLOCK_STACK_SIZE].block; lbh = bread(&sbd, tblock); - type = get_block_type(lbh, NULL); - print_block_type(tblock, type, ""); + type = get_block_type(lbh->b_data); + print_block_type(tblock, type); brelse(lbh); gfs2_rgrp_free(&sbd, &sbd.rgtree); exit(0); @@ -1803,17 +1737,15 @@ static void process_field(const char *field, const char *nstr) { uint64_t fblock; struct gfs2_buffer_head *rbh; - int type; const struct lgfs2_metadata *mtype; const struct lgfs2_metafield *mfield;

fblock = blockstack[blockhist % BLOCK_STACK_SIZE].block; rbh = bread(&sbd, fblock); - type = get_block_type(rbh, NULL); - - mtype = lgfs2_find_mtype(type, sbd.gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2); + mtype = get_block_type(rbh->b_data); if (mtype == NULL) { - fprintf(stderr, "Metadata type '%d' invalid\n", type); + fprintf(stderr, "Metadata type of block %"PRIx64" not recognised\n", + fblock); exit(1); }

@@ -2116,12 +2048,11 @@ static void interactive_mode(void) /* ------------------------------------------------------------------------ */ /* gfs_log_header_in - read in a gfs1-style log header */ /* ------------------------------------------------------------------------ */ -void gfs_log_header_in(struct gfs_log_header *head, - struct gfs2_buffer_head *lbh) +void gfs_log_header_in(struct gfs_log_header *head, const char *buf) { - struct gfs_log_header *str = lbh->iov.iov_base; + const struct gfs_log_header *str = (void *)buf;

- gfs2_meta_header_in(&head->lh_header, lbh->b_data); + gfs2_meta_header_in(&head->lh_header, buf);

head->lh_flags = be32_to_cpu(str->lh_flags); head->lh_pad = be32_to_cpu(str->lh_pad); diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h index ab2d44d..a73c150 100644 --- a/gfs2/edit/hexedit.h +++ b/gfs2/edit/hexedit.h @@ -224,8 +224,7 @@ extern int block_is_quota_file(uint64_t blk); extern int block_is_per_node(uint64_t blk); extern int display_block_type(struct gfs2_buffer_head *bh, int from_restore); extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf); -extern void gfs_log_header_in(struct gfs_log_header *head, - struct gfs2_buffer_head *bh); +extern void gfs_log_header_in(struct gfs_log_header *head, const char *buf); extern void gfs_log_header_print(struct gfs_log_header *lh); extern void savemeta(char *out_fn, int saveoption, int gziplevel); extern void restoremeta(const char *in_fn, const char *out_device, @@ -236,7 +235,6 @@ extern uint64_t check_keywords(const char *kword); extern uint64_t masterblock(const char *fn); extern void gfs_rgrp_print(struct gfs_rgrp *rg); extern int has_indirect_blocks(void); -extern uint32_t get_block_type(const struct gfs2_buffer_head *lbh, - int *structlen); +extern const struct lgfs2_metadata *get_block_type(char *buf);

#endif /* __HEXVIEW_DOT_H__ */ diff --git a/gfs2/edit/journal.c b/gfs2/edit/journal.c index aa94592..1adbc4b 100644 --- a/gfs2/edit/journal.c +++ b/gfs2/edit/journal.c @@ -306,14 +306,14 @@ static int print_ld_blks(const uint64_t *b, const char *end, int start_line,

static int is_wrap_pt(char *buf, uint64_t *highest_seq) { - struct gfs2_buffer_head tbh = { .b_data = buf }; + const struct lgfs2_metadata *mtype = get_block_type(buf);

- if (get_block_type(&tbh, NULL) == GFS2_METATYPE_LH) { + if (mtype != NULL && mtype->mh_type == GFS2_METATYPE_LH) { uint64_t seq;

if (sbd.gfs1) { struct gfs_log_header lh; - gfs_log_header_in(&lh, &tbh); + gfs_log_header_in(&lh, buf); seq = lh.lh_sequence; } else { struct gfs2_log_header lh; @@ -421,20 +421,24 @@ static int process_ld(uint64_t abs_block, uint64_t wrappt, uint64_t j_size, */ static int meta_has_ref(uint64_t abs_block, int tblk) { + const struct lgfs2_metadata *mtype; struct gfs2_buffer_head *mbh; - int structlen, ty, has_ref = 0; + int structlen = 0, has_ref = 0; uint64_t *b; struct gfs2_dinode *dinode;

mbh = bread(&sbd, abs_block); - ty = get_block_type(mbh, &structlen); - if (ty == GFS2_METATYPE_DI) { - dinode = (struct gfs2_dinode *)mbh->b_data; - if (be64_to_cpu(dinode->di_eattr) == tblk) - has_ref = 1; + mtype = get_block_type(mbh->b_data); + if (mtype != NULL) { + structlen = mtype->size; + if (mtype->mh_type == GFS2_METATYPE_DI) { + dinode = (struct gfs2_dinode *)mbh->b_data; + if (be64_to_cpu(dinode->di_eattr) == tblk) + has_ref = 1; + } } b = (uint64_t *)(mbh->b_data + structlen); - while (!has_ref && ty && (char *)b < mbh->b_data + sbd.bsize) { + while (!has_ref && mtype && (char *)b < mbh->b_data + sbd.bsize) { if (be64_to_cpu(*b) == tblk) has_ref = 1; b++; @@ -478,7 +482,7 @@ void dump_journal(const char *journal, int tblk) { const struct lgfs2_metadata *mtype; const struct lgfs2_metafield *lh_flags_field; - struct gfs2_buffer_head *j_bh = NULL, dummy_bh; + struct gfs2_buffer_head *j_bh = NULL; uint64_t jblock, j_size, jb, abs_block, saveblk, wrappt = 0; int start_line, journal_num; struct gfs2_inode *j_inode = NULL; @@ -486,6 +490,7 @@ void dump_journal(const char *journal, int tblk) uint64_t tblk_off = 0, bblk_off = 0, bitblk = 0; uint64_t highest_seq = 0; char *jbuf = NULL; + char *buf = NULL; struct rgrp_tree *rgd = NULL; uint64_t abs_ld = 0;

@@ -564,20 +569,23 @@ void dump_journal(const char *journal, int tblk) brelse(j_bh); abs_block = jblock + ((jb + wrappt) % j_size); j_bh = bread(&sbd, abs_block); - dummy_bh.b_data = j_bh->b_data; + buf = j_bh->b_data; } else { int error = fsck_readi(j_inode, (void *)jbuf, ((jb + wrappt) % j_size), sbd.bsize, &abs_block); if (!error) /* end of file */ break; - dummy_bh.b_data = jbuf; + buf = jbuf; } offset_from_ld++; - block_type = get_block_type(&dummy_bh, NULL); + mtype = get_block_type(buf); + if (mtype != NULL) + block_type = mtype->mh_type; + if (block_type == GFS2_METATYPE_LD) { ld_blocks = process_ld(abs_block, wrappt, j_size, jb, - dummy_bh.b_data, tblk, &tblk_off, + buf, tblk, &tblk_off, bitblk, rgd, &is_pertinent, &bblk_off); offset_from_ld = 0; @@ -587,7 +595,7 @@ void dump_journal(const char *journal, int tblk) struct gfs_log_header lh1;

if (sbd.gfs1) { - gfs_log_header_in(&lh1, &dummy_bh); + gfs_log_header_in(&lh1, buf); check_journal_wrap(lh1.lh_sequence, &highest_seq); print_gfs2("0x%"PRIx64" (j+%4"PRIx64"): Log header: " @@ -600,11 +608,11 @@ void dump_journal(const char *journal, int tblk) } else { char flags_str[256];

- gfs2_log_header_in(&lh, dummy_bh.b_data); + gfs2_log_header_in(&lh, buf); check_journal_wrap(lh.lh_sequence, &highest_seq); lgfs2_field_str(flags_str, sizeof(flags_str), - dummy_bh.b_data, lh_flags_field, + buf, lh_flags_field, (dmode == HEX_MODE)); print_gfs2("0x%"PRIx64" (j+%4"PRIx64"): Log header: Seq" ": 0x%llx, tail: 0x%x, blk: 0x%x [%s]", @@ -616,18 +624,15 @@ void dump_journal(const char *journal, int tblk) eol(0); } else if ((ld_blocks > 0) && (sbd.gfs1 || block_type == GFS2_METATYPE_LB)) { + uint64_t *b = (uint64_t *)(buf + (sbd.gfs1 ? 0 : sizeof(struct gfs2_meta_header))); + print_gfs2("0x%"PRIx64" (j+%4"PRIx64"): Log descriptor" " continuation block", abs_block, ((jb + wrappt) % j_size) / sbd.bsize); eol(0); print_gfs2(" "); - ld_blocks -= print_ld_blks((uint64_t *)dummy_bh.b_data + - (sbd.gfs1 ? 0 : - sizeof(struct gfs2_meta_header)), - (dummy_bh.b_data + - sbd.bsize), start_line, - tblk, &tblk_off, 0, rgd, - 0, 1, NULL, 0); + ld_blocks -= print_ld_blks(b, (buf + sbd.bsize), start_line, + tblk, &tblk_off, 0, rgd, 0, 1, NULL, 0); } else if (block_type == 0) { continue; }

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 284e76809e749e9e568dc3454b1ef8b38a09e7af Author: Andrew Price anprice@redhat.com AuthorDate: Sat May 23 13:56:37 2020 +0100

gfs2_edit: Don't use gfs2_buffer_head in display_gfs2()

Now we can finally get rid of that dummy_bh in restore_data()

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/gfs2hex.c | 37 ++++++++++++++++++------------------- gfs2/edit/gfs2hex.h | 2 +- gfs2/edit/hexedit.c | 2 +- gfs2/edit/savemeta.c | 6 +----- 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c index 7274303..3204577 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -351,7 +351,7 @@ uint64_t do_leaf_extended(char *dlebuf, struct iinfo *indir) return indir->ii[0].lf.lf_next; }

-static void do_eattr_extended(struct gfs2_buffer_head *ebh) +static void do_eattr_extended(char *buf) { struct gfs2_ea_header ea; unsigned int x; @@ -364,9 +364,8 @@ static void do_eattr_extended(struct gfs2_buffer_head *ebh) x += ea.ea_rec_len) { eol(0); - gfs2_ea_header_in(&ea, ebh->b_data + x); - gfs2_ea_header_print(&ea, ebh->b_data + x + - sizeof(struct gfs2_ea_header)); + gfs2_ea_header_in(&ea, buf + x); + gfs2_ea_header_print(&ea, buf + x + sizeof(struct gfs2_ea_header)); } }

@@ -429,11 +428,11 @@ static void gfs2_sb_print2(struct gfs2_sb *sbp2) /** * gfs1_rgrp_in - read in a gfs1 rgrp */ -static void gfs1_rgrp_in(struct gfs_rgrp *rgrp, struct gfs2_buffer_head *rbh) +static void gfs1_rgrp_in(struct gfs_rgrp *rgrp, const char *buf) { - struct gfs_rgrp *str = (struct gfs_rgrp *)rbh->b_data; + struct gfs_rgrp *str = (struct gfs_rgrp *)buf;

- gfs2_meta_header_in(&rgrp->rg_header, rbh->b_data); + gfs2_meta_header_in(&rgrp->rg_header, buf); rgrp->rg_flags = be32_to_cpu(str->rg_flags); rgrp->rg_free = be32_to_cpu(str->rg_free); rgrp->rg_useddi = be32_to_cpu(str->rg_useddi); @@ -460,7 +459,7 @@ static void gfs1_rgrp_print(struct gfs_rgrp *rg) pv(rg, rg_freemeta, "%u", "0x%x"); }

-int display_gfs2(struct gfs2_buffer_head *dbh) +int display_gfs2(char *buf) { struct gfs2_meta_header mh; struct gfs2_rgrp rg; @@ -472,12 +471,12 @@ int display_gfs2(struct gfs2_buffer_head *dbh)

uint32_t magic;

- magic = be32_to_cpu(*(uint32_t *)dbh->b_data); + magic = be32_to_cpu(*(uint32_t *)buf);

switch (magic) { case GFS2_MAGIC: - gfs2_meta_header_in(&mh, dbh->b_data); + gfs2_meta_header_in(&mh, buf); if (mh.mh_type > GFS2_METATYPE_QC) print_gfs2("Unknown metadata type"); else @@ -487,7 +486,7 @@ int display_gfs2(struct gfs2_buffer_head *dbh) switch (mh.mh_type) { case GFS2_METATYPE_SB: - gfs2_sb_in(&sbd.sd_sb, dbh->b_data); + gfs2_sb_in(&sbd.sd_sb, buf); gfs2_sb_print2(&sbd.sd_sb); break;

@@ -495,10 +494,10 @@ int display_gfs2(struct gfs2_buffer_head *dbh) if (sbd.gfs1) { struct gfs_rgrp rg1;

- gfs1_rgrp_in(&rg1, dbh); + gfs1_rgrp_in(&rg1, buf); gfs1_rgrp_print(&rg1); } else { - gfs2_rgrp_in(&rg, dbh->b_data); + gfs2_rgrp_in(&rg, buf); gfs2_rgrp_print(&rg); } break; @@ -516,7 +515,7 @@ int display_gfs2(struct gfs2_buffer_head *dbh) break;

case GFS2_METATYPE_LF: - gfs2_leaf_in(&lf, dbh->b_data); + gfs2_leaf_in(&lf, buf); gfs2_leaf_print(&lf); break;

@@ -526,21 +525,21 @@ int display_gfs2(struct gfs2_buffer_head *dbh)

case GFS2_METATYPE_LH: if (sbd.gfs1) { - gfs_log_header_in(&lh1, dbh->b_data); + gfs_log_header_in(&lh1, buf); gfs_log_header_print(&lh1); } else { - gfs2_log_header_in(&lh, dbh->b_data); + gfs2_log_header_in(&lh, buf); gfs2_log_header_print(&lh); } break;

case GFS2_METATYPE_LD: - gfs2_log_descriptor_in(&ld, dbh->b_data); + gfs2_log_descriptor_in(&ld, buf); gfs2_log_descriptor_print(&ld); break;

case GFS2_METATYPE_EA: - do_eattr_extended(dbh); + do_eattr_extended(buf); break;

case GFS2_METATYPE_ED: @@ -552,7 +551,7 @@ int display_gfs2(struct gfs2_buffer_head *dbh) break;

case GFS2_METATYPE_QC: - gfs2_quota_change_in(&qc, dbh->b_data); + gfs2_quota_change_in(&qc, buf); gfs2_quota_change_print(&qc); break;

diff --git a/gfs2/edit/gfs2hex.h b/gfs2/edit/gfs2hex.h index 6c6ddde..878ab80 100644 --- a/gfs2/edit/gfs2hex.h +++ b/gfs2/edit/gfs2hex.h @@ -3,7 +3,7 @@

#include "hexedit.h"

-extern int display_gfs2(struct gfs2_buffer_head *dbh); +extern int display_gfs2(char *buf); extern int edit_gfs2(void); extern void do_dinode_extended(struct gfs2_dinode *di, char *buf); extern void print_gfs2(const char *fmt, ...) __attribute__((format (printf, 1, 2))); diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 6019996..f8b6f67 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1099,7 +1099,7 @@ int display(int identify_only, int trunc_zeros, uint64_t flagref, flagref, ref_blk); else if (dmode == GFS2_MODE) { /* if structure display */ if (block != JOURNALS_DUMMY_BLOCK) - display_gfs2(bh); /* display the gfs2 structure */ + display_gfs2(bh->b_data); } else display_extended(); /* display extended blocks */ /* No else here because display_extended can switch back to hex mode */ diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index f3c85b0..43ac425 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -1148,13 +1148,9 @@ static int restore_data(int fd, struct metafd *mfd, int printonly) }

if (printonly) { - struct gfs2_buffer_head dummy_bh = { - .b_data = bp, - .b_blocknr = savedata.blk, - }; if (printonly > 1 && printonly == savedata.blk) { display_block_type(bp, savedata.blk, TRUE); - display_gfs2(&dummy_bh); + display_gfs2(bp); break; } else if (printonly == 1) { print_gfs2("%"PRId64" (l=0x%x): ", blks_saved, savedata.siglen);

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 9c870dedf165a75348737460a94d09b9fe79bbdd Author: Andrew Price anprice@redhat.com AuthorDate: Sat May 23 22:17:32 2020 +0100

savemeta: Simplify di_save_len()

We only need to consider 2 or 3 dinode fields to decide how much of a dinode block needs to be saved, so ditch the ..._inode_get() calls and just look at the relevant fields. Also accept a char * instead of a gfs2_buffer_head because that's all we need now.

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 0c54155..249b49a 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -296,36 +296,25 @@ static int block_is_systemfile(uint64_t blk) block_is_per_node(blk) || block_is_in_per_node(blk); }

-static size_t di_save_len(struct gfs2_buffer_head *bh, uint64_t owner) +static size_t di_save_len(const char *buf, uint64_t owner) { - struct gfs2_inode *inode; - struct gfs2_dinode *dn; - size_t len; - - if (sbd.gfs1) - inode = lgfs2_gfs_inode_get(&sbd, bh->b_data); - else - inode = lgfs2_inode_get(&sbd, bh); + const struct gfs2_dinode *dn; + uint16_t di_height; + uint32_t di_mode; + int gfs1dir;

- if (inode == NULL) { - fprintf(stderr, "Error reading inode at %"PRIu64": %s\n", - bh->b_blocknr, strerror(errno)); - return 0; /* Skip the block */ - } - dn = &inode->i_di; - len = sizeof(struct gfs2_dinode); + dn = (void *)buf; + di_mode = be32_to_cpu(dn->di_mode); + di_height = be16_to_cpu(dn->di_height); + /* __pad1 is di_type in gfs1 */ + gfs1dir = sbd.gfs1 && (be16_to_cpu(dn->__pad1) == GFS_FILE_DIR);

/* Do not save (user) data from the inode block unless they are indirect pointers, dirents, symlinks or fs internal data */ - if (dn->di_height != 0 || - S_ISDIR(dn->di_mode) || - S_ISLNK(dn->di_mode) || - (sbd.gfs1 && dn->__pad1 == GFS_FILE_DIR) || - block_is_systemfile(owner)) - len = sbd.bsize; - - inode_put(&inode); - return len; + if (di_height > 0 || S_ISDIR(di_mode) || S_ISLNK(di_mode) || gfs1dir + || block_is_systemfile(owner)) + return sbd.bsize; + return sizeof(struct gfs2_dinode); }

/* @@ -366,7 +355,7 @@ static int get_gfs_struct_info(struct gfs2_buffer_head *lbh, uint64_t owner, *gstruct_len = sbd.bsize; break; case GFS2_METATYPE_DI: /* 4 (disk inode) */ - *gstruct_len = di_save_len(lbh, owner); + *gstruct_len = di_save_len(lbh->b_data, owner); break; case GFS2_METATYPE_IN: /* 5 (indir inode blklst) */ *gstruct_len = sbd.bsize; /*sizeof(struct gfs_indirect);*/

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 025a98184c9a92db8627eb0143e48a026b52477e Author: Andrew Price anprice@redhat.com AuthorDate: Sat May 23 22:38:34 2020 +0100

savemeta: Remove gfs2_buffer_head from save_bh() (and rename it)

Now that get_gfs_struct_info() accepts a char* we can make save_bh() the true save_buf().

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 937fed4..1d47f46 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -522,7 +522,7 @@ static int savemetaclose(struct metafd *mfd) return close(mfd->fd); }

-static int save_buf(struct metafd *mfd, char *buf, uint64_t addr, unsigned blklen) +static int do_save_buf(struct metafd *mfd, const char *buf, uint64_t addr, unsigned blklen) { struct saved_metablock *savedata; size_t outsz; @@ -554,7 +554,7 @@ static int save_buf(struct metafd *mfd, char *buf, uint64_t addr, unsigned blkle return 0; }

-static int save_bh(struct metafd *mfd, struct gfs2_buffer_head *savebh, uint64_t owner, int *blktype) +static int save_buf(struct metafd *mfd, const char *buf, uint64_t addr, uint64_t owner, int *blktype) { size_t blklen;

@@ -563,11 +563,11 @@ static int save_bh(struct metafd *mfd, struct gfs2_buffer_head *savebh, uint64_t because we want to know if the source inode is a system inode not the block within the inode "blk". They may or may not be the same thing. */ - if (get_gfs_struct_info(savebh->b_data, owner, blktype, &blklen) && + if (get_gfs_struct_info(buf, owner, blktype, &blklen) && !block_is_systemfile(owner) && owner != 0) return 0; /* Not metadata, and not system file, so skip it */

- return save_buf(mfd, savebh->b_data, savebh->b_blocknr, blklen); + return do_save_buf(mfd, buf, addr, blklen); }

static int save_block(int fd, struct metafd *mfd, uint64_t blk, uint64_t owner, int *blktype) @@ -583,7 +583,7 @@ static int save_block(int fd, struct metafd *mfd, uint64_t blk, uint64_t owner, savebh = bread(&sbd, blk); if (savebh == NULL) return 1; - err = save_bh(mfd, savebh, owner, blktype); + err = save_buf(mfd, savebh->b_data, blk, owner, blktype); brelse(savebh); return err; } @@ -671,7 +671,7 @@ static int save_leaf_chain(struct metafd *mfd, struct gfs2_sbd *sdp, uint64_t bl } warm_fuzzy_stuff(blk, FALSE); if (gfs2_check_meta(bh->b_data, GFS2_METATYPE_LF) == 0) { - int ret = save_bh(mfd, bh, blk, NULL); + int ret = save_buf(mfd, bh->b_data, blk, blk, NULL); if (ret != 0) { brelse(bh); return ret; @@ -912,7 +912,7 @@ static void save_rgrp(struct gfs2_sbd *sdp, struct metafd *mfd, struct rgrp_tree /* Save the rg and bitmaps */ for (unsigned i = 0; i < rgd->ri.ri_length; i++) { warm_fuzzy_stuff(rgd->ri.ri_addr + i, FALSE); - save_buf(mfd, buf + (i * sdp->bsize), rgd->ri.ri_addr + i, sdp->bsize); + do_save_buf(mfd, buf + (i * sdp->bsize), rgd->ri.ri_addr + i, sdp->bsize); } /* Save the other metadata: inodes, etc. if mode is not 'savergs' */ if (withcontents)

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit a51ecda4156895705fe0d071218b2ca7188e718e Author: Andrew Price anprice@redhat.com AuthorDate: Sat May 23 23:09:43 2020 +0100

savemeta: Remove gfs2_buffer_head from save_block()

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 47c998c..8afa8e6 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -572,19 +572,28 @@ static int save_buf(struct metafd *mfd, const char *buf, uint64_t addr, uint64_t

static int save_block(int fd, struct metafd *mfd, uint64_t blk, uint64_t owner, int *blktype) { - struct gfs2_buffer_head *savebh; + char *buf; int err;

+ buf = calloc(1, sbd.bsize); + if (buf == NULL) { + fprintf(stderr, "Failed to read block 0x%"PRIx64" (in 0x%"PRIx64"): %s\n", + blk, owner, strerror(errno)); + return 1; + } if (gfs2_check_range(&sbd, blk) && blk != LGFS2_SB_ADDR(&sbd)) { fprintf(stderr, "Warning: bad pointer 0x%"PRIx64" ignored in block 0x%"PRIx64"\n", blk, owner); return 0; } - savebh = bread(&sbd, blk); - if (savebh == NULL) + if (pread(sbd.device_fd, buf, sbd.bsize, sbd.bsize * blk) != sbd.bsize) { + fprintf(stderr, "Failed to read block 0x%"PRIx64" (in 0x%"PRIx64"): %s\n", + blk, owner, strerror(errno)); + free(buf); return 1; - err = save_buf(mfd, savebh->b_data, blk, owner, blktype); - brelse(savebh); + } + err = save_buf(mfd, buf, blk, owner, blktype); + free(buf); return err; }

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 4b3631829146e9889258109d3d5547a8b17e2c4d Author: Andrew Price anprice@redhat.com AuthorDate: Sun May 24 12:31:55 2020 +0100

savemeta: Call get_struct_info() in the read path

Makes no sense to figure out the block type and length in save_buf(), it's too late to do much with it at that point. Move the get_gfs_struct_info() call and other checks into check_read_block(). Which means save_buf() can now be merged with do_save_buf().

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 89 +++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 42 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index cbead77..0de7dbf 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -335,7 +335,9 @@ static int get_gfs_struct_info(const char *buf, uint64_t owner, int *block_type,

if (block_type != NULL) *block_type = 0; - *gstruct_len = sbd.bsize; + + if (gstruct_len != NULL) + *gstruct_len = sbd.bsize;

gfs2_meta_header_in(&mh, buf); if (mh.mh_magic != GFS2_MAGIC) @@ -344,6 +346,9 @@ static int get_gfs_struct_info(const char *buf, uint64_t owner, int *block_type, if (block_type != NULL) *block_type = mh.mh_type;

+ if (gstruct_len == NULL) + return 0; + switch (mh.mh_type) { case GFS2_METATYPE_SB: /* 1 (superblock) */ *gstruct_len = sizeof(struct gfs_sb); @@ -522,7 +527,7 @@ static int savemetaclose(struct metafd *mfd) return close(mfd->fd); }

-static int do_save_buf(struct metafd *mfd, const char *buf, uint64_t addr, unsigned blklen) +static int save_buf(struct metafd *mfd, const char *buf, uint64_t addr, unsigned blklen) { struct saved_metablock *savedata; size_t outsz; @@ -554,23 +559,7 @@ static int do_save_buf(struct metafd *mfd, const char *buf, uint64_t addr, unsig return 0; }

-static int save_buf(struct metafd *mfd, const char *buf, uint64_t addr, uint64_t owner, int *blktype) -{ - size_t blklen; - - /* If this isn't metadata and isn't a system file, we don't want it. - Note that we're checking "owner" here rather than blk. That's - because we want to know if the source inode is a system inode - not the block within the inode "blk". They may or may not - be the same thing. */ - if (get_gfs_struct_info(buf, owner, blktype, &blklen) && - !block_is_systemfile(owner) && owner != 0) - return 0; /* Not metadata, and not system file, so skip it */ - - return do_save_buf(mfd, buf, addr, blklen); -} - -static char *check_read_block(int fd, uint64_t blk) +static char *check_read_block(int fd, uint64_t blk, uint64_t owner, int *blktype, size_t *blklen) { char *buf = calloc(1, sbd.bsize); if (buf == NULL) { @@ -588,6 +577,11 @@ static char *check_read_block(int fd, uint64_t blk) free(buf); return NULL; } + if (get_gfs_struct_info(buf, owner, blktype, blklen) && + !block_is_systemfile(owner) && owner != 0) { + free(buf); + return NULL; + } return buf; }

@@ -614,9 +608,9 @@ static void save_ea_block(struct metafd *mfd, char *buf, uint64_t owner) b = (uint64_t *)buf; b += charoff + i; blk = be64_to_cpu(*b); - _buf = check_read_block(sbd.device_fd, blk); + _buf = check_read_block(sbd.device_fd, blk, owner, NULL, NULL); if (_buf != NULL) { - save_buf(mfd, _buf, blk, owner, NULL); + save_buf(mfd, _buf, blk, sbd.bsize); free(_buf); } } @@ -633,7 +627,7 @@ static void save_indirect_blocks(struct metafd *mfd, osi_list_t *cur_list, { uint64_t old_block = 0, indir_block; uint64_t *ptr; - int head_size, blktype; + int head_size; struct gfs2_buffer_head *nbh;

head_size = (hgt > 1 ? @@ -642,6 +636,8 @@ static void save_indirect_blocks(struct metafd *mfd, osi_list_t *cur_list,

for (ptr = (uint64_t *)(mybh->b_data + head_size); (char *)ptr < (mybh->b_data + sbd.bsize); ptr++) { + size_t blklen; + int blktype; char *buf;

if (!*ptr) @@ -651,9 +647,9 @@ static void save_indirect_blocks(struct metafd *mfd, osi_list_t *cur_list, continue; old_block = indir_block;

- buf = check_read_block(sbd.device_fd, indir_block); + buf = check_read_block(sbd.device_fd, indir_block, owner, &blktype, &blklen); if (buf != NULL) { - save_buf(mfd, buf, indir_block, owner, &blktype); + save_buf(mfd, buf, indir_block, blklen); free(buf); }

@@ -698,7 +694,7 @@ static int save_leaf_chain(struct metafd *mfd, struct gfs2_sbd *sdp, uint64_t bl } warm_fuzzy_stuff(blk, FALSE); if (gfs2_check_meta(buf, GFS2_METATYPE_LF) == 0) { - int ret = save_buf(mfd, buf, blk, blk, NULL); + int ret = save_buf(mfd, buf, blk, sdp->bsize); if (ret != 0) { free(buf); return ret; @@ -806,13 +802,16 @@ static void save_inode_data(struct metafd *mfd, uint64_t iblk) } if (inode->i_di.di_eattr) { /* if this inode has extended attributes */ struct gfs2_buffer_head *lbh; + size_t blklen; + uint64_t blk; int mhtype; char *buf;

- lbh = bread(&sbd, inode->i_di.di_eattr); - buf = check_read_block(sbd.device_fd, inode->i_di.di_eattr); + blk = inode->i_di.di_eattr; + lbh = bread(&sbd, blk); + buf = check_read_block(sbd.device_fd, blk, iblk, &mhtype, &blklen); if (buf != NULL) { - save_buf(mfd, buf, inode->i_di.di_eattr, iblk, &mhtype); + save_buf(mfd, buf, blk, blklen); free(buf); } if (mhtype == GFS2_METATYPE_EA) @@ -875,12 +874,14 @@ static void get_journal_inode_blocks(void)

static void save_allocated(struct rgrp_tree *rgd, struct metafd *mfd) { - int blktype; uint64_t blk = 0; unsigned i, j, m; uint64_t *ibuf = malloc(sbd.bsize * GFS2_NBBY * sizeof(uint64_t));

for (i = 0; i < rgd->ri.ri_length; i++) { + size_t blen; + int btype; + m = lgfs2_bm_scan(rgd, i, ibuf, GFS2_BLKST_DINODE);

for (j = 0; j < m; j++) { @@ -888,13 +889,13 @@ static void save_allocated(struct rgrp_tree *rgd, struct metafd *mfd)

blk = ibuf[j]; warm_fuzzy_stuff(blk, FALSE); - buf = check_read_block(sbd.device_fd, blk); + buf = check_read_block(sbd.device_fd, blk, blk, &btype, &blen); if (buf != NULL) { - save_buf(mfd, buf, blk, blk, &blktype); + save_buf(mfd, buf, blk, blen); free(buf); + if (btype == GFS2_METATYPE_DI) + save_inode_data(mfd, blk); } - if (blktype == GFS2_METATYPE_DI) - save_inode_data(mfd, blk); } if (!sbd.gfs1) continue; @@ -903,9 +904,9 @@ static void save_allocated(struct rgrp_tree *rgd, struct metafd *mfd) * If we don't, we may run into metadata allocation issues. */ m = lgfs2_bm_scan(rgd, i, ibuf, GFS2_BLKST_UNLINKED); for (j = 0; j < m; j++) { - char *buf = check_read_block(sbd.device_fd, blk); + char *buf = check_read_block(sbd.device_fd, blk, blk, &btype, &blen); if (buf != NULL) { - save_buf(mfd, buf, blk, blk, &blktype); + save_buf(mfd, buf, blk, blen); free(buf); } } @@ -954,7 +955,7 @@ static void save_rgrp(struct gfs2_sbd *sdp, struct metafd *mfd, struct rgrp_tree /* Save the rg and bitmaps */ for (unsigned i = 0; i < rgd->ri.ri_length; i++) { warm_fuzzy_stuff(rgd->ri.ri_addr + i, FALSE); - do_save_buf(mfd, buf + (i * sdp->bsize), rgd->ri.ri_addr + i, sdp->bsize); + save_buf(mfd, buf + (i * sdp->bsize), rgd->ri.ri_addr + i, sdp->bsize); } /* Save the other metadata: inodes, etc. if mode is not 'savergs' */ if (withcontents) @@ -1006,6 +1007,7 @@ void savemeta(char *out_fn, int saveoption, int gziplevel) struct gfs2_buffer_head *lbh; struct metafd mfd; struct osi_node *n; + uint64_t sb_addr; int err = 0; char *buf;

@@ -1042,9 +1044,10 @@ void savemeta(char *out_fn, int saveoption, int gziplevel) exit(1); } /* Save off the superblock */ - buf = check_read_block(sbd.device_fd, GFS2_SB_ADDR * GFS2_BASIC_BLOCK / sbd.bsize); + sb_addr = GFS2_SB_ADDR * GFS2_BASIC_BLOCK / sbd.bsize; + buf = check_read_block(sbd.device_fd, sb_addr, 0, NULL, NULL); if (buf != NULL) { - save_buf(&mfd, buf, GFS2_SB_ADDR * GFS2_BASIC_BLOCK / sbd.bsize, 0, NULL); + save_buf(&mfd, buf, sb_addr, sizeof(struct gfs_sb)); free(buf); } /* If this is gfs1, save off the rindex because it's not @@ -1054,9 +1057,9 @@ void savemeta(char *out_fn, int saveoption, int gziplevel) int j;

blk = sbd1->sb_rindex_di.no_addr; - buf = check_read_block(sbd.device_fd, blk); + buf = check_read_block(sbd.device_fd, blk, blk, NULL, NULL); if (buf != NULL) { - save_buf(&mfd, buf, blk, blk, NULL); + save_buf(&mfd, buf, blk, sbd.bsize); free(buf); } save_inode_data(&mfd, blk); @@ -1066,9 +1069,11 @@ void savemeta(char *out_fn, int saveoption, int gziplevel)

log_debug("Saving journal #%d\n", j + 1); for (blk = jb; blk < (jb + gfs1_journal_size); blk++) { - buf = check_read_block(sbd.device_fd, blk); + size_t blen; + + buf = check_read_block(sbd.device_fd, blk, blk, NULL, &blen); if (buf != NULL) { - save_buf(&mfd, buf, blk, blk, NULL); + save_buf(&mfd, buf, blk, blen); free(buf); } }

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 946305332753f63d515a0cd7a73c201b36e6a3f3 Author: Andrew Price anprice@redhat.com AuthorDate: Fri May 29 16:56:52 2020 +0100

savemeta: Process indirect pointers in chunks

Where indirect pointers point to consecutive blocks, use the new block range structures to read them in one go. The largest read is bounded by the number of pointers in a block, so just under 2MB for a 4K block size. Replace the lists of buffer heads for each metadata tree height with a simpler queue structure.

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 192 ++++++++++++++++++++++++++++----------------------- 1 file changed, 107 insertions(+), 85 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 50d93b0..76477b7 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -560,6 +560,7 @@ static int save_buf(struct metafd *mfd, const char *buf, uint64_t addr, unsigned }

struct block_range { + struct block_range *next; uint64_t start; unsigned len; unsigned *blktype; @@ -567,6 +568,11 @@ struct block_range { char *buf; };

+struct block_range_queue { + struct block_range *tail; + struct block_range **head; +}; + static int save_range(struct metafd *mfd, struct block_range *br) { for (unsigned i = 0; i < br->len; i++) { @@ -668,54 +674,68 @@ static void save_ea_block(struct metafd *mfd, char *buf, uint64_t owner) } }

-/* - * save_indirect_blocks - save all indirect blocks for the given buffer - */ -static void save_indirect_blocks(struct metafd *mfd, osi_list_t *cur_list, - struct gfs2_buffer_head *mybh, uint64_t owner, int height, int hgt) +static void save_indirect_range(struct metafd *mfd, struct block_range **brp, uint64_t owner, + struct block_range_queue *q) { - uint64_t old_block = 0, indir_block; - uint64_t *ptr; - int head_size; - struct gfs2_buffer_head *nbh; + struct block_range *br = *brp;

- head_size = (hgt > 1 ? - sizeof(struct gfs2_meta_header) : - sizeof(struct gfs2_dinode)); + if (check_read_range(sbd.device_fd, br, owner) != 0) + return;

- for (ptr = (uint64_t *)(mybh->b_data + head_size); - (char *)ptr < (mybh->b_data + sbd.bsize); ptr++) { - size_t blklen; - int blktype; - char *buf; + save_range(mfd, br); + for (unsigned i = 0; i < br->len; i++) { + if (br->blktype[i] == GFS2_METATYPE_EA) + save_ea_block(mfd, br->buf + (i * sbd.bsize), owner); + } + if (q) { + *q->head = br; + q->head = &br->next; + *brp = NULL; /* The list now has ownership of it */ + } else { + free(br->buf); + br->buf = NULL; + } +} + +static void save_indirect_blocks(struct metafd *mfd, char *buf, uint64_t owner, + struct block_range_queue *q, unsigned headsize) +{ + uint64_t old_block = 0, indir_block; + struct block_range *br = NULL; + uint64_t *ptr;

+ for (ptr = (uint64_t *)(buf + headsize); + (char *)ptr < (buf + sbd.bsize); ptr++) { if (!*ptr) continue; + indir_block = be64_to_cpu(*ptr); if (indir_block == old_block) continue; old_block = indir_block;

- buf = check_read_block(sbd.device_fd, indir_block, owner, &blktype, &blklen); - if (buf != NULL) { - save_buf(mfd, buf, indir_block, blklen); - free(buf); - } - - if (blktype == GFS2_METATYPE_EA) { - nbh = bread(&sbd, indir_block); - save_ea_block(mfd, nbh->b_data, owner); - brelse(nbh); - } - if (height != hgt && /* If not at max height and */ - (!gfs2_check_range(&sbd, indir_block))) { - nbh = bread(&sbd, indir_block); - osi_list_add_prev(&nbh->b_altlist, cur_list); - /* The buffer_head needs to be queued ahead, so - don't release it! - brelse(nbh);*/ + if (br == NULL) { +new_range: + br = calloc(1, sizeof(*br)); + if (br == NULL) { + perror("Failed to save indirect blocks"); + return; + } + br->start = indir_block; + br->len = 1; + } else if (indir_block == br->start + br->len) { + br->len++; + } else { + save_indirect_range(mfd, &br, owner, q); + if (br == NULL) /* This one was queued up for later */ + goto new_range; + br->start = indir_block; + br->len = 1; } - } /* for all data on the indirect block */ + } + if (br != NULL && br->start != 0) + save_indirect_range(mfd, &br, owner, q); + free(br); }

static int save_leaf_chain(struct metafd *mfd, struct gfs2_sbd *sdp, uint64_t blk) @@ -761,6 +781,7 @@ static int save_leaf_chain(struct metafd *mfd, struct gfs2_sbd *sdp, uint64_t bl * save_inode_data - save off important data associated with an inode * * mfd - destination file descriptor + * buf - buffer containing the inode block * iblk - block number of the inode to save the data for * * For user files, we don't want anything except all the indirect block @@ -772,17 +793,55 @@ static int save_leaf_chain(struct metafd *mfd, struct gfs2_sbd *sdp, uint64_t bl * For file system journals, the "data" is a mixture of metadata and * journaled data. We want all the metadata and none of the user data. */ -static void save_inode_data(struct metafd *mfd, uint64_t iblk) +static void save_inode_data(struct metafd *mfd, char *ibuf, uint64_t iblk) { + struct block_range_queue indq[GFS2_MAX_META_HEIGHT] = {{NULL}}; + struct gfs2_buffer_head *metabh; uint32_t height; struct gfs2_inode *inode; - osi_list_t metalist[GFS2_MAX_META_HEIGHT]; - osi_list_t *prev_list, *cur_list, *tmp; - struct gfs2_buffer_head *metabh, *mybh; - int i; + struct gfs2_dinode _di = {0}; + + for (unsigned i = 0; i < GFS2_MAX_META_HEIGHT; i++) + indq[i].head = &indq[i].tail; + + gfs2_dinode_in(&_di, ibuf); + height = _di.di_height; + + /* If this is a user inode, we don't follow to the file height. + We stop one level less. That way we save off the indirect + pointer blocks but not the actual file contents. The exception + is directories, where the height represents the level at which + the hash table exists, and we have to save the directory data. */ + + if (_di.di_flags & GFS2_DIF_EXHASH && (S_ISDIR(_di.di_mode) || + (sbd.gfs1 && _di.__pad1 == GFS_FILE_DIR))) + height++; + else if (height > 0 && !(_di.di_flags & GFS2_DIF_SYSTEM) && + !block_is_systemfile(iblk) && !S_ISDIR(_di.di_mode)) + height--; + + if (height > 0) + save_indirect_blocks(mfd, ibuf, iblk, height == 1 ? NULL : &indq[0], sizeof(_di)); + for (unsigned i = 1; i < height; i++) { + struct block_range_queue *nextq = &indq[i]; + + if (i == height - 1) + nextq = NULL; + + while (indq[i - 1].tail != NULL) { + struct block_range *q = indq[i - 1].tail;

- for (i = 0; i < GFS2_MAX_META_HEIGHT; i++) - osi_list_init(&metalist[i]); + for (unsigned j = 0; j < q->len; j++) { + char *_buf = q->buf + (j * sbd.bsize); + + save_indirect_blocks(mfd, _buf, iblk, nextq, sizeof(_di.di_header)); + } + warm_fuzzy_stuff(q->start + q->len, 0); + indq[i - 1].tail = q->next; + free(q->buf); + free(q); + } + } metabh = bread(&sbd, iblk); if (sbd.gfs1) { inode = lgfs2_gfs_inode_get(&sbd, metabh->b_data); @@ -793,45 +852,6 @@ static void save_inode_data(struct metafd *mfd, uint64_t iblk) perror("Failed to read inode"); exit(-1); } - height = inode->i_di.di_height; - /* If this is a user inode, we don't follow to the file height. - We stop one level less. That way we save off the indirect - pointer blocks but not the actual file contents. The exception - is directories, where the height represents the level at which - the hash table exists, and we have to save the directory data. */ - if (inode->i_di.di_flags & GFS2_DIF_EXHASH && - (S_ISDIR(inode->i_di.di_mode) || - (sbd.gfs1 && inode->i_di.__pad1 == GFS_FILE_DIR))) - height++; - else if (height && !(inode->i_di.di_flags & GFS2_DIF_SYSTEM) && - !block_is_systemfile(iblk) && !S_ISDIR(inode->i_di.di_mode)) - height--; - osi_list_add(&metabh->b_altlist, &metalist[0]); - for (i = 1; i <= height; i++){ - prev_list = &metalist[i - 1]; - cur_list = &metalist[i]; - - for (tmp = prev_list->next; tmp != prev_list; tmp = tmp->next){ - mybh = osi_list_entry(tmp, struct gfs2_buffer_head, - b_altlist); - warm_fuzzy_stuff(iblk, FALSE); - save_indirect_blocks(mfd, cur_list, mybh, iblk, - height, i); - } /* for blocks at that height */ - } /* for height */ - /* free metalists */ - for (i = 0; i < GFS2_MAX_META_HEIGHT; i++) { - cur_list = &metalist[i]; - while (!osi_list_empty(cur_list)) { - mybh = osi_list_entry(cur_list->next, - struct gfs2_buffer_head, - b_altlist); - if (mybh == inode->i_bh) - osi_list_del(&mybh->b_altlist); - else - brelse(mybh); - } - } /* Process directory exhash inodes */ if (S_ISDIR(inode->i_di.di_mode) && inode->i_di.di_flags & GFS2_DIF_EXHASH) { @@ -866,7 +886,7 @@ static void save_inode_data(struct metafd *mfd, uint64_t iblk) if (mhtype == GFS2_METATYPE_EA) save_ea_block(mfd, lbh->b_data, iblk); else if (mhtype == GFS2_METATYPE_IN) - save_indirect_blocks(mfd, cur_list, lbh, iblk, 2, 2); + save_indirect_blocks(mfd, lbh->b_data, iblk, NULL, sizeof(di.di_header)); brelse(lbh); } inode_put(&inode); @@ -928,8 +948,10 @@ static void save_allocated_range(struct metafd *mfd, struct block_range *br)

save_range(mfd, br); for (unsigned i = 0; i < br->len; i++) { + char *buf = br->buf + (i * sbd.bsize); + if (br->blktype[i] == GFS2_METATYPE_DI) - save_inode_data(mfd, br->start + i); + save_inode_data(mfd, buf, br->start + i); } free(br->buf); } @@ -1126,9 +1148,9 @@ void savemeta(char *out_fn, int saveoption, int gziplevel) buf = check_read_block(sbd.device_fd, blk, blk, NULL, NULL); if (buf != NULL) { save_buf(&mfd, buf, blk, sbd.bsize); + save_inode_data(&mfd, buf, blk); free(buf); } - save_inode_data(&mfd, blk); /* In GFS1, journals aren't part of the RG space */ for (j = 0; j < journals_found; j++) { uint64_t jb = journal_blocks[j];

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 24c011b17ad1e9f0488e5105fde70a2ebf92c2cc Author: Andrew Price anprice@redhat.com AuthorDate: Fri May 29 22:21:51 2020 +0100

savemeta: Leaf block processing improvements

We've already walked the indirect pointer tree and read the leaf blocks earlier, so hold onto those and use them to read down the leaf chains, instead of doing a gfs2_readi() for every leaf block.

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 59 +++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 55f6492..ea09d2b 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -740,17 +740,14 @@ new_range: free(br); }

-static int save_leaf_chain(struct metafd *mfd, struct gfs2_sbd *sdp, uint64_t blk) +static int save_leaf_chain(struct metafd *mfd, struct gfs2_sbd *sdp, char *buf) { struct gfs2_leaf leaf; - char *buf = calloc(1, sdp->bsize);

- if (buf == NULL) { - perror("Failed to save leaf blocks"); - return 1; - } + gfs2_leaf_in(&leaf, buf);

- do { + while (leaf.lf_next != 0) { + uint64_t blk = leaf.lf_next; ssize_t r;

if (gfs2_check_range(sdp, blk) != 0) @@ -772,13 +769,26 @@ static int save_leaf_chain(struct metafd *mfd, struct gfs2_sbd *sdp, uint64_t bl } } gfs2_leaf_in(&leaf, buf); - blk = leaf.lf_next; - } while (leaf.lf_next != 0); - - free(buf); + } return 0; }

+static void save_leaf_blocks(struct metafd *mfd, struct block_range_queue *q) +{ + while (q->tail != NULL) { + struct block_range *br = q->tail; + + for (unsigned i = 0; i < br->len; i++) { + char *buf = br->buf + (i * sbd.bsize); + + save_leaf_chain(mfd, &sbd, buf); + } + q->tail = br->next; + free(br->buf); + free(br); + } +} + /* * save_inode_data - save off important data associated with an inode * @@ -802,6 +812,7 @@ static void save_inode_data(struct metafd *mfd, char *ibuf, uint64_t iblk) uint32_t height; struct gfs2_inode *inode; struct gfs2_dinode _di = {0}; + int is_exhash;

for (unsigned i = 0; i < GFS2_MAX_META_HEIGHT; i++) indq[i].head = &indq[i].tail; @@ -815,8 +826,9 @@ static void save_inode_data(struct metafd *mfd, char *ibuf, uint64_t iblk) is directories, where the height represents the level at which the hash table exists, and we have to save the directory data. */

- if (_di.di_flags & GFS2_DIF_EXHASH && (S_ISDIR(_di.di_mode) || - (sbd.gfs1 && _di.__pad1 == GFS_FILE_DIR))) + is_exhash = (S_ISDIR(_di.di_mode) || (sbd.gfs1 && _di.__pad1 == GFS_FILE_DIR)) && + _di.di_flags & GFS2_DIF_EXHASH; + if (is_exhash) height++; else if (height > 0 && !(_di.di_flags & GFS2_DIF_SYSTEM) && !block_is_systemfile(iblk) && !S_ISDIR(_di.di_mode)) @@ -827,7 +839,7 @@ static void save_inode_data(struct metafd *mfd, char *ibuf, uint64_t iblk) for (unsigned i = 1; i < height; i++) { struct block_range_queue *nextq = &indq[i];

- if (i == height - 1) + if (!is_exhash && i == height - 1) nextq = NULL;

while (indq[i - 1].tail != NULL) { @@ -844,6 +856,8 @@ static void save_inode_data(struct metafd *mfd, char *ibuf, uint64_t iblk) free(q); } } + if (is_exhash) + save_leaf_blocks(mfd, &indq[height - 1]); metabh = bread(&sbd, iblk); if (sbd.gfs1) { inode = lgfs2_gfs_inode_get(&sbd, metabh->b_data); @@ -854,23 +868,6 @@ static void save_inode_data(struct metafd *mfd, char *ibuf, uint64_t iblk) perror("Failed to read inode"); exit(-1); } - /* Process directory exhash inodes */ - if (S_ISDIR(inode->i_di.di_mode) && - inode->i_di.di_flags & GFS2_DIF_EXHASH) { - uint64_t leaf_no, old_leaf = -1; - int li; - - for (li = 0; li < (1 << inode->i_di.di_depth); li++) { - if (lgfs2_get_leaf_ptr(inode, li, &leaf_no)) { - fprintf(stderr, "Could not read leaf index %d in dinode %"PRIu64"\n", li, - (uint64_t)inode->i_di.di_num.no_addr); - exit(-1); - } - if (leaf_no != old_leaf && save_leaf_chain(mfd, &sbd, leaf_no) != 0) - exit(-1); - old_leaf = leaf_no; - } - } if (inode->i_di.di_eattr) { /* if this inode has extended attributes */ struct gfs2_buffer_head *lbh; size_t blklen;

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 7f489f259f84269719888573aef3e42cd42a3948 Author: Andrew Price anprice@redhat.com AuthorDate: Sat May 30 01:19:27 2020 +0100

savemeta: Remove some unnecessary jindex reading code

This section reads the jindex and walks its tree but the data it gathers is not used subsequently. The jindex and journals will be picked up by the bitmap walk later.

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 11 ----------- 1 file changed, 11 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 272f796..fe7a6d7 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -1073,8 +1073,6 @@ static int parse_header(char *buf, struct savemeta_header *smh)

void savemeta(char *out_fn, int saveoption, int gziplevel) { - uint64_t jindex_block; - struct gfs2_buffer_head *lbh; struct metafd mfd; struct osi_node *n; uint64_t sb_addr; @@ -1090,15 +1088,6 @@ void savemeta(char *out_fn, int saveoption, int gziplevel) sbd.bsize = sbd.sd_sb.sb_bsize; printf("There are %llu blocks of %u bytes in the filesystem.\n", (unsigned long long)sbd.fssize, sbd.bsize); - if (sbd.gfs1) - jindex_block = sbd1->sb_jindex_di.no_addr; - else - jindex_block = masterblock("jindex"); - lbh = bread(&sbd, jindex_block); - gfs2_dinode_in(&di, lbh->b_data); - if (!sbd.gfs1) - do_dinode_extended(&di, lbh->b_data); - brelse(lbh);

printf("Filesystem size: %.2fGB\n", (sbd.fssize * sbd.bsize) / ((float)(1 << 30))); get_journal_inode_blocks();

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master in repository gfs2-utils.

commit 9e1e5b815a4ed1a5209dedf5dda00c8235c55bd6 Author: Andrew Price anprice@redhat.com AuthorDate: Fri Jun 5 14:50:13 2020 +0100

restoremeta: Fix up superblock processing

Prior to 933c03b 'restoremeta: Metadata file reading overhaul' restoremeta restored the superblock to gather information, did a seek back to before the superblock and then carried on to restore the superblock properly. When that commit removed the seeks it didn't add new printing code for the superblock (for gfs2_edit printsavedmeta). Add that missing printing code and make sure the filesystem information is printed in the right order.

Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 759113f..80c11c9 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -351,7 +351,10 @@ static int get_gfs_struct_info(const char *buf, uint64_t owner, unsigned *block_

switch (mh.mh_type) { case GFS2_METATYPE_SB: /* 1 (superblock) */ - *gstruct_len = sizeof(struct gfs_sb); + if (sbd.gfs1) + *gstruct_len = sizeof(struct gfs_sb); + else + *gstruct_len = sizeof(struct gfs2_sb); break; case GFS2_METATYPE_RG: /* 2 (rsrc grp hdr) */ *gstruct_len = sbd.bsize; /*sizeof(struct gfs_rgrp);*/ @@ -1151,7 +1154,10 @@ void savemeta(char *out_fn, int saveoption, int gziplevel) sb_addr = GFS2_SB_ADDR * GFS2_BASIC_BLOCK / sbd.bsize; buf = check_read_block(sbd.device_fd, sb_addr, 0, NULL, NULL); if (buf != NULL) { - save_buf(&mfd, buf, sb_addr, sizeof(struct gfs_sb)); + if (sbd.gfs1) + save_buf(&mfd, buf, sb_addr, sizeof(struct gfs_sb)); + else + save_buf(&mfd, buf, sb_addr, sizeof(struct gfs2_sb)); free(buf); } /* If this is gfs1, save off the rindex because it's not @@ -1263,7 +1269,7 @@ static int restore_super(struct metafd *mfd, char *buf, int printonly) fprintf(stderr, "Failed to write superblock\n"); return -1; } - printf("Block size is %uB\n", sbd.bsize); + blks_saved++; return 0; }

@@ -1279,7 +1285,6 @@ static int restore_data(int fd, struct metafd *mfd, int printonly) exit(1); }

- blks_saved = 0; while (TRUE) { char *bp;

@@ -1338,6 +1343,7 @@ static int restore_init(const char *path, struct metafd *mfd, struct savemeta_he char *bp; int ret;

+ blks_saved = 0; restore_buf = malloc(RESTORE_BUF_SIZE); if (restore_buf == NULL) { perror("Restore failed"); @@ -1379,11 +1385,26 @@ static int restore_init(const char *path, struct metafd *mfd, struct savemeta_he fprintf(stderr, "No superblock found in metadata file\n"); return -1; } - ret = restore_super(mfd, bp + sizeof(struct saved_metablock), printonly); + bp += sizeof(struct saved_metablock); + ret = restore_super(mfd, bp, printonly); if (ret != 0) return ret;

- bp += sizeof(struct saved_metablock) + sb_siglen; + if (smh->sh_fs_bytes > 0) { + sbd.fssize = smh->sh_fs_bytes / sbd.bsize; + printf("Saved file system size is %"PRIu64" blocks, %.2fGB\n", + sbd.fssize, smh->sh_fs_bytes / ((float)(1 << 30))); + } + printf("Block size is %uB\n", sbd.bsize); + printf("This is gfs%c metadata.\n", sbd.gfs1 ? '1': '2'); + if (printonly > 1 && printonly == LGFS2_SB_ADDR(&sbd)) { + display_block_type(bp, LGFS2_SB_ADDR(&sbd), TRUE); + display_gfs2(bp); + } else if (printonly == 1) { + print_gfs2("0 (l=0x%x): ", sb_siglen); + display_block_type(bp, LGFS2_SB_ADDR(&sbd), TRUE); + } + bp += sb_siglen; restore_off = bp - restore_buf; restore_left -= restore_off; return 0; @@ -1414,14 +1435,6 @@ void restoremeta(const char *in_fn, const char *out_device, uint64_t printonly) if (error != 0) exit(error);

- if (smh.sh_fs_bytes > 0) { - sbd.fssize = smh.sh_fs_bytes / sbd.bsize; - printf("Saved file system size is %"PRIu64" blocks, %.2fGB\n", - sbd.fssize, smh.sh_fs_bytes / ((float)(1 << 30))); - } - - printf("This is gfs%c metadata.\n", sbd.gfs1 ? '1': '2'); - if (!printonly) { uint64_t space = lseek(sbd.device_fd, 0, SEEK_END) / sbd.bsize; printf("There are %"PRIu64" free blocks on the destination device.\n", space);