gfs2-utils: master - gfs2_convert: remember number of blocks when converting quotas

Bob Peterson rpeterso at fedoraproject.org
Fri Dec 21 16:39:49 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=b180bc7302d47319674be977d1d621405eca406f
Commit:        b180bc7302d47319674be977d1d621405eca406f
Parent:        606330ca9fec696123c075da069b0790811aa58d
Author:        Bob Peterson <rpeterso at redhat.com>
AuthorDate:    Mon Dec 17 14:56:16 2012 -0600
Committer:     Bob Peterson <rpeterso at redhat.com>
CommitterDate: Thu Dec 20 14:30:52 2012 -0600

gfs2_convert: remember number of blocks when converting quotas

This patch changes function copy_quotas so that it properly copies
the di_blocks field from the GFS1 quotas file to its new GFS2 file.
If the quota file had a non-trivial size, gfs2_convert was copying
all the data and pointers, but not properly setting the di_blocks.
This ordinarily isn't tragic because the file is never deleted, but
it did flag fsck.gfs2 errors.

rhbz#887374
---
 gfs2/convert/gfs2_convert.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index 095f4ed..61d1504 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -2084,6 +2084,7 @@ static void copy_quotas(struct gfs2_sbd *sdp)
 
 	nq_ip->i_di.di_height = oq_ip->i_di.di_height;
 	nq_ip->i_di.di_size = oq_ip->i_di.di_size;
+	nq_ip->i_di.di_blocks = oq_ip->i_di.di_blocks;
 	memcpy(nq_ip->i_bh->b_data + sizeof(struct gfs2_dinode), 
 	       oq_ip->i_bh->b_data + sizeof(struct gfs2_dinode),
 	       sdp->bsize - sizeof(struct gfs2_dinode));


More information about the cluster-commits mailing list