cluster: RHEL55 - GFS2: gfs2_edit savemeta wasn't saving ea sub-blocks
Bob Peterson
rpeterso at fedoraproject.org
Wed Oct 7 19:14:23 UTC 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9d1b57ae8baa0592b556654feaa86414cadc4e2b
Commit: 9d1b57ae8baa0592b556654feaa86414cadc4e2b
Parent: cf17511802fceb706729b0cdddeb0e960300d3aa
Author: Bob Peterson <rpeterso at redhat.com>
AuthorDate: Tue Jun 16 14:46:09 2009 -0500
Committer: Bob Peterson <rpeterso at redhat.com>
CommitterDate: Wed Oct 7 14:03:22 2009 -0500
GFS2: gfs2_edit savemeta wasn't saving ea sub-blocks
Indirect extended attribute blocks may have sub-blocks, and those
weren't getting saved. This adds that capability.
rhbz#527770
---
gfs2/edit/savemeta.c | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
index b5bf33f..d2fca05 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -200,8 +200,9 @@ int save_block(int fd, int out_fd, uint64_t blk)
char *p;
if (blk > last_fs_block) {
- fprintf(stderr, "\nWarning: bad block pointer ignored in "
- "block (block %llu (%llx))",
+ fprintf(stderr, "\nWarning: bad block pointer '0x%llx' "
+ "ignored in block (block %llu (%llx))",
+ (unsigned long long)blk,
(unsigned long long)block, (unsigned long long)block);
return 0;
}
@@ -235,6 +236,35 @@ int save_block(int fd, int out_fd, uint64_t blk)
}
/*
+ * save_ea_block - save off an extended attribute block
+ */
+void save_ea_block(int out_fd, struct gfs2_buffer_head *metabh)
+{
+ int i, e, ea_len = sbd.bsize;
+ struct gfs2_ea_header ea;
+
+ for (e = sizeof(struct gfs2_meta_header); e < sbd.bsize; e += ea_len) {
+ uint64_t blk, *b;
+ int charoff;
+
+ gfs2_ea_header_in(&ea, metabh->b_data + e);
+ for (i = 0; i < ea.ea_num_ptrs; i++) {
+ charoff = e + ea.ea_name_len +
+ sizeof(struct gfs2_ea_header) +
+ sizeof(uint64_t) - 1;
+ charoff /= sizeof(uint64_t);
+ b = (uint64_t *)(metabh->b_data);
+ b += charoff + i;
+ blk = be64_to_cpu(*b);
+ save_block(sbd.device_fd, out_fd, blk);
+ }
+ if (!ea.ea_rec_len)
+ break;
+ ea_len = ea.ea_rec_len;
+ }
+}
+
+/*
* save_indirect_blocks - save all indirect blocks for the given buffer
*/
void save_indirect_blocks(int out_fd, osi_list_t *cur_list,
@@ -242,7 +272,7 @@ void save_indirect_blocks(int out_fd, osi_list_t *cur_list,
{
uint64_t old_block = 0, indir_block;
uint64_t *ptr;
- int head_size;
+ int head_size, blktype;
struct gfs2_buffer_head *nbh;
head_size = (hgt > 1 ?
@@ -257,7 +287,12 @@ void save_indirect_blocks(int out_fd, osi_list_t *cur_list,
if (indir_block == old_block)
continue;
old_block = indir_block;
- save_block(sbd.device_fd, out_fd, indir_block);
+ blktype = save_block(sbd.device_fd, out_fd, indir_block);
+ if (blktype == GFS2_METATYPE_EA) {
+ nbh = bread(&sbd.buf_list, indir_block);
+ save_ea_block(out_fd, nbh);
+ brelse(nbh, not_updated);
+ }
if (height != hgt) { /* If not at max height */
nbh = bread(&sbd.buf_list, indir_block);
osi_list_add_prev(&nbh->b_altlist,
More information about the cluster-commits
mailing list