public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_bulkstat
@ 2013-12-11 13:48 Jeff Liu
  2013-12-11 23:27 ` Dave Chinner
  0 siblings, 1 reply; 3+ messages in thread
From: Jeff Liu @ 2013-12-11 13:48 UTC (permalink / raw)
  To: xfs@oss.sgi.com

From: Jie Liu <jeff.liu@oracle.com>

Use xfs_ialloc_blks_per_cluster() in xfs_bulkstat(), make the
related variables more meaningful and remove an unused variable
nimask from it.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
---
 fs/xfs/xfs_itable.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index c237ad1..6671f5b 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -209,9 +209,8 @@ xfs_bulkstat(
 	xfs_inobt_rec_incore_t	*irbuf;	/* start of irec buffer */
 	xfs_inobt_rec_incore_t	*irbufend; /* end of good irec buffer entries */
 	xfs_ino_t		lastino; /* last inode number returned */
-	int			nbcluster; /* # of blocks in a cluster */
-	int			nicluster; /* # of inodes in a cluster */
-	int			nimask;	/* mask for inode clusters */
+	int			blks_per_cluster; /* # of blocks in a cluster */
+	int			ninodes; /* # of inodes in a cluster */
 	int			nirbuf;	/* size of irbuf */
 	int			rval;	/* return value error code */
 	int			tmp;	/* result value from btree calls */
@@ -243,11 +242,8 @@ xfs_bulkstat(
 	*done = 0;
 	fmterror = 0;
 	ubufp = ubuffer;
-	nicluster = mp->m_sb.sb_blocksize >= XFS_INODE_CLUSTER_SIZE(mp) ?
-		mp->m_sb.sb_inopblock :
-		(XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog);
-	nimask = ~(nicluster - 1);
-	nbcluster = nicluster >> mp->m_sb.sb_inopblog;
+	blks_per_cluster = xfs_ialloc_blks_per_cluster(mp);
+	ninodes = blks_per_cluster << mp->m_sb.sb_inopblog;
 	irbuf = kmem_zalloc_greedy(&irbsize, PAGE_SIZE, PAGE_SIZE * 4);
 	if (!irbuf)
 		return ENOMEM;
@@ -390,12 +386,12 @@ xfs_bulkstat(
 				agbno = XFS_AGINO_TO_AGBNO(mp, r.ir_startino);
 				for (chunkidx = 0;
 				     chunkidx < XFS_INODES_PER_CHUNK;
-				     chunkidx += nicluster,
-				     agbno += nbcluster) {
-					if (xfs_inobt_maskn(chunkidx, nicluster)
+				     chunkidx += ninodes,
+				     agbno += blks_per_cluster) {
+					if (xfs_inobt_maskn(chunkidx, ninodes)
 							& ~r.ir_free)
 						xfs_btree_reada_bufs(mp, agno,
-							agbno, nbcluster,
+							agbno, blks_per_cluster,
 							&xfs_inode_buf_ops);
 				}
 				blk_finish_plug(&plug);
-- 
1.8.3.2

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 2/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_bulkstat
  2013-12-11 13:48 [PATCH 2/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_bulkstat Jeff Liu
@ 2013-12-11 23:27 ` Dave Chinner
  2013-12-12  3:00   ` Jeff Liu
  0 siblings, 1 reply; 3+ messages in thread
From: Dave Chinner @ 2013-12-11 23:27 UTC (permalink / raw)
  To: Jeff Liu; +Cc: xfs@oss.sgi.com

On Wed, Dec 11, 2013 at 09:48:14PM +0800, Jeff Liu wrote:
> From: Jie Liu <jeff.liu@oracle.com>
> 
> Use xfs_ialloc_blks_per_cluster() in xfs_bulkstat(), make the
> related variables more meaningful and remove an unused variable
> nimask from it.
> 
> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> ---
>  fs/xfs/xfs_itable.c | 20 ++++++++------------
>  1 file changed, 8 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
> index c237ad1..6671f5b 100644
> --- a/fs/xfs/xfs_itable.c
> +++ b/fs/xfs/xfs_itable.c
> @@ -209,9 +209,8 @@ xfs_bulkstat(
>  	xfs_inobt_rec_incore_t	*irbuf;	/* start of irec buffer */
>  	xfs_inobt_rec_incore_t	*irbufend; /* end of good irec buffer entries */
>  	xfs_ino_t		lastino; /* last inode number returned */
> -	int			nbcluster; /* # of blocks in a cluster */
> -	int			nicluster; /* # of inodes in a cluster */
> -	int			nimask;	/* mask for inode clusters */
> +	int			blks_per_cluster; /* # of blocks in a cluster */
> +	int			ninodes; /* # of inodes in a cluster */

inodes_per_cluster?

>  	int			nirbuf;	/* size of irbuf */
>  	int			rval;	/* return value error code */
>  	int			tmp;	/* result value from btree calls */
> @@ -243,11 +242,8 @@ xfs_bulkstat(
>  	*done = 0;
>  	fmterror = 0;
>  	ubufp = ubuffer;
> -	nicluster = mp->m_sb.sb_blocksize >= XFS_INODE_CLUSTER_SIZE(mp) ?
> -		mp->m_sb.sb_inopblock :
> -		(XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog);
> -	nimask = ~(nicluster - 1);
> -	nbcluster = nicluster >> mp->m_sb.sb_inopblog;
> +	blks_per_cluster = xfs_ialloc_blks_per_cluster(mp);

Ok, now I see the helper name, perhaps it shoul dbe more like all
the other conversion functions. "ialloc" means nothing in the
context, and "blks" doesn't tell us the unit we are converting to
- if could be basic blocks, it could be filesystem blocks. So,
perhaps something like xfs_icluster_size_fsb()?

Otherwise this patch looks ok.

Cheers,

Dave.

-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 2/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_bulkstat
  2013-12-11 23:27 ` Dave Chinner
@ 2013-12-12  3:00   ` Jeff Liu
  0 siblings, 0 replies; 3+ messages in thread
From: Jeff Liu @ 2013-12-12  3:00 UTC (permalink / raw)
  To: Dave Chinner; +Cc: xfs@oss.sgi.com


On 12/12 2013 07:27 AM, Dave Chinner wrote:
> On Wed, Dec 11, 2013 at 09:48:14PM +0800, Jeff Liu wrote:
>> From: Jie Liu <jeff.liu@oracle.com>
>>
>> Use xfs_ialloc_blks_per_cluster() in xfs_bulkstat(), make the
>> related variables more meaningful and remove an unused variable
>> nimask from it.
>>
>> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
>> ---
>>  fs/xfs/xfs_itable.c | 20 ++++++++------------
>>  1 file changed, 8 insertions(+), 12 deletions(-)
>>
>> diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
>> index c237ad1..6671f5b 100644
>> --- a/fs/xfs/xfs_itable.c
>> +++ b/fs/xfs/xfs_itable.c
>> @@ -209,9 +209,8 @@ xfs_bulkstat(
>>  	xfs_inobt_rec_incore_t	*irbuf;	/* start of irec buffer */
>>  	xfs_inobt_rec_incore_t	*irbufend; /* end of good irec buffer entries */
>>  	xfs_ino_t		lastino; /* last inode number returned */
>> -	int			nbcluster; /* # of blocks in a cluster */
>> -	int			nicluster; /* # of inodes in a cluster */
>> -	int			nimask;	/* mask for inode clusters */
>> +	int			blks_per_cluster; /* # of blocks in a cluster */
>> +	int			ninodes; /* # of inodes in a cluster */
> 
> inodes_per_cluster?
Ok.
> 
>>  	int			nirbuf;	/* size of irbuf */
>>  	int			rval;	/* return value error code */
>>  	int			tmp;	/* result value from btree calls */
>> @@ -243,11 +242,8 @@ xfs_bulkstat(
>>  	*done = 0;
>>  	fmterror = 0;
>>  	ubufp = ubuffer;
>> -	nicluster = mp->m_sb.sb_blocksize >= XFS_INODE_CLUSTER_SIZE(mp) ?
>> -		mp->m_sb.sb_inopblock :
>> -		(XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog);
>> -	nimask = ~(nicluster - 1);
>> -	nbcluster = nicluster >> mp->m_sb.sb_inopblog;
>> +	blks_per_cluster = xfs_ialloc_blks_per_cluster(mp);
> 
> Ok, now I see the helper name, perhaps it shoul dbe more like all
> the other conversion functions. "ialloc" means nothing in the
> context, and "blks" doesn't tell us the unit we are converting to
> - if could be basic blocks, it could be filesystem blocks. So,
> perhaps something like xfs_icluster_size_fsb()?
Sounds make sense to me, I'd like to adopt this name.

Thanks,
-Jeff

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-12  3:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-11 13:48 [PATCH 2/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_bulkstat Jeff Liu
2013-12-11 23:27 ` Dave Chinner
2013-12-12  3:00   ` Jeff Liu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox