On Thu, 28 Jan 2010, Daniel Mack wrote: > Signed-off-by: Daniel Mack <[email protected]> > Cc: Jiri Kosina <[email protected]> > Cc: Dave Kleikamp <[email protected]> > Cc: André Goddard Rosa <[email protected]> > Cc: [email protected] > --- > fs/jfs/jfs_dmap.c | 16 ++++++++-------- > fs/jfs/jfs_dmap.h | 6 +++--- > 2 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c > index d9b031c..7e19d2f 100644 > --- a/fs/jfs/jfs_dmap.c > +++ b/fs/jfs/jfs_dmap.c > @@ -195,7 +195,7 @@ int dbMount(struct inode *ipbmap) > bmp->db_maxag = le32_to_cpu(dbmp_le->dn_maxag); > bmp->db_agpref = le32_to_cpu(dbmp_le->dn_agpref); > bmp->db_aglevel = le32_to_cpu(dbmp_le->dn_aglevel); > - bmp->db_agheigth = le32_to_cpu(dbmp_le->dn_agheigth); > + bmp->db_agheight = le32_to_cpu(dbmp_le->dn_agheight); > bmp->db_agwidth = le32_to_cpu(dbmp_le->dn_agwidth); > bmp->db_agstart = le32_to_cpu(dbmp_le->dn_agstart); > bmp->db_agl2size = le32_to_cpu(dbmp_le->dn_agl2size); > @@ -287,7 +287,7 @@ int dbSync(struct inode *ipbmap) > dbmp_le->dn_maxag = cpu_to_le32(bmp->db_maxag); > dbmp_le->dn_agpref = cpu_to_le32(bmp->db_agpref); > dbmp_le->dn_aglevel = cpu_to_le32(bmp->db_aglevel); > - dbmp_le->dn_agheigth = cpu_to_le32(bmp->db_agheigth); > + dbmp_le->dn_agheight = cpu_to_le32(bmp->db_agheight); > dbmp_le->dn_agwidth = cpu_to_le32(bmp->db_agwidth); > dbmp_le->dn_agstart = cpu_to_le32(bmp->db_agstart); > dbmp_le->dn_agl2size = cpu_to_le32(bmp->db_agl2size); > @@ -1440,7 +1440,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int > l2nb, s64 * results) > * tree index of this allocation group within the control page. > */ > agperlev = > - (1 << (L2LPERCTL - (bmp->db_agheigth << 1))) / bmp->db_agwidth; > + (1 << (L2LPERCTL - (bmp->db_agheight << 1))) / bmp->db_agwidth; > ti = bmp->db_agstart + bmp->db_agwidth * (agno & (agperlev - 1)); > > /* dmap control page trees fan-out by 4 and a single allocation > @@ -1459,7 +1459,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int > l2nb, s64 * results) > * the subtree to find the leftmost leaf that describes this > * free space. > */ > - for (k = bmp->db_agheigth; k > 0; k--) { > + for (k = bmp->db_agheight; k > 0; k--) { > for (n = 0, m = (ti << 2) + 1; n < 4; n++) { > if (l2nb <= dcp->stree[m + n]) { > ti = m + n; > @@ -3606,7 +3606,7 @@ void dbFinalizeBmap(struct inode *ipbmap) > } > > /* > - * compute db_aglevel, db_agheigth, db_width, db_agstart: > + * compute db_aglevel, db_agheight, db_width, db_agstart: > * an ag is covered in aglevel dmapctl summary tree, > * at agheight level height (from leaf) with agwidth number of nodes > * each, which starts at agstart index node of the smmary tree node > @@ -3615,9 +3615,9 @@ void dbFinalizeBmap(struct inode *ipbmap) > bmp->db_aglevel = BMAPSZTOLEV(bmp->db_agsize); > l2nl = > bmp->db_agl2size - (L2BPERDMAP + bmp->db_aglevel * L2LPERCTL); > - bmp->db_agheigth = l2nl >> 1; > - bmp->db_agwidth = 1 << (l2nl - (bmp->db_agheigth << 1)); > - for (i = 5 - bmp->db_agheigth, bmp->db_agstart = 0, n = 1; i > 0; > + bmp->db_agheight = l2nl >> 1; > + bmp->db_agwidth = 1 << (l2nl - (bmp->db_agheight << 1)); > + for (i = 5 - bmp->db_agheight, bmp->db_agstart = 0, n = 1; i > 0; > i--) { > bmp->db_agstart += n; > n <<= 2; > diff --git a/fs/jfs/jfs_dmap.h b/fs/jfs/jfs_dmap.h > index 1a6eb41..6dcb906 100644 > --- a/fs/jfs/jfs_dmap.h > +++ b/fs/jfs/jfs_dmap.h > @@ -210,7 +210,7 @@ struct dbmap_disk { > __le32 dn_maxag; /* 4: max active alloc group number */ > __le32 dn_agpref; /* 4: preferred alloc group (hint) */ > __le32 dn_aglevel; /* 4: dmapctl level holding the AG */ > - __le32 dn_agheigth; /* 4: height in dmapctl of the AG */ > + __le32 dn_agheight; /* 4: height in dmapctl of the AG */ > __le32 dn_agwidth; /* 4: width in dmapctl of the AG */ > __le32 dn_agstart; /* 4: start tree index at AG height */ > __le32 dn_agl2size; /* 4: l2 num of blks per alloc group */ > @@ -229,7 +229,7 @@ struct dbmap { > int dn_maxag; /* max active alloc group number */ > int dn_agpref; /* preferred alloc group (hint) */ > int dn_aglevel; /* dmapctl level holding the AG */ > - int dn_agheigth; /* height in dmapctl of the AG */ > + int dn_agheight; /* height in dmapctl of the AG */ > int dn_agwidth; /* width in dmapctl of the AG */ > int dn_agstart; /* start tree index at AG height */ > int dn_agl2size; /* l2 num of blks per alloc group */ > @@ -255,7 +255,7 @@ struct bmap { > #define db_agsize db_bmap.dn_agsize > #define db_agl2size db_bmap.dn_agl2size > #define db_agwidth db_bmap.dn_agwidth > -#define db_agheigth db_bmap.dn_agheigth > +#define db_agheight db_bmap.dn_agheight > #define db_agstart db_bmap.dn_agstart > #define db_numag db_bmap.dn_numag > #define db_maxlevel db_bmap.dn_maxlevel
I have now applied this to my tree. Dave, if you want to take it through your tree, or just Ack/Nack it, please let me know. Thanks, -- Jiri Kosina SUSE Labs, Novell Inc. ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ Jfs-discussion mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/jfs-discussion
