xfs
[Top] [All Lists]

Re: [PATCH 5/6] xfsprogs: use xfs_icluster_size_fsb in xfs_ialloc_inode_

To: Jeff Liu <jeff.liu@xxxxxxxxxx>
Subject: Re: [PATCH 5/6] xfsprogs: use xfs_icluster_size_fsb in xfs_ialloc_inode_init
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Mon, 5 May 2014 17:10:31 -0400
Cc: "xfs@xxxxxxxxxxx" <xfs@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <536784D9.1030502@xxxxxxxxxx>
References: <536784D9.1030502@xxxxxxxxxx>
User-agent: Mutt/1.5.21 (2010-09-15)
On Mon, May 05, 2014 at 08:32:25PM +0800, Jeff Liu wrote:
> From: Jie Liu <jeff.liu@xxxxxxxxxx>
> 
> Use xfs_icluster_size_fsb() in xfs_ialloc_inode_init(), rename variable
> ninodes to inodes_per_cluster as the latter is more  meaningful.
> 
> Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx>
> ---

Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>

>  libxfs/xfs_ialloc.c | 17 +++++------------
>  1 file changed, 5 insertions(+), 12 deletions(-)
> 
> diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
> index a3a1c75..7d2ae8d 100644
> --- a/libxfs/xfs_ialloc.c
> +++ b/libxfs/xfs_ialloc.c
> @@ -146,7 +146,7 @@ xfs_ialloc_inode_init(
>  {
>       struct xfs_buf          *fbuf;
>       struct xfs_dinode       *free;
> -     int                     blks_per_cluster, nbufs, ninodes;
> +     int                     nbufs, blks_per_cluster, inodes_per_cluster;
>       int                     version;
>       int                     i, j;
>       xfs_daddr_t             d;
> @@ -157,16 +157,9 @@ xfs_ialloc_inode_init(
>        * For small block sizes, manipulate the inodes in buffers
>        * which are multiples of the blocks size.
>        */
> -     if (mp->m_sb.sb_blocksize >= mp->m_inode_cluster_size) {
> -             blks_per_cluster = 1;
> -             nbufs = length;
> -             ninodes = mp->m_sb.sb_inopblock;
> -     } else {
> -             blks_per_cluster = mp->m_inode_cluster_size /
> -                                mp->m_sb.sb_blocksize;
> -             nbufs = length / blks_per_cluster;
> -             ninodes = blks_per_cluster * mp->m_sb.sb_inopblock;
> -     }
> +     blks_per_cluster = xfs_icluster_size_fsb(mp);
> +     inodes_per_cluster = blks_per_cluster << mp->m_sb.sb_inopblog;
> +     nbufs = length / blks_per_cluster;
>  
>       /*
>        * Figure out what version number to use in the inodes we create.  If
> @@ -222,7 +215,7 @@ xfs_ialloc_inode_init(
>               /* Initialize the inode buffers and log them appropriately. */
>               fbuf->b_ops = &xfs_inode_buf_ops;
>               xfs_buf_zero(fbuf, 0, BBTOB(fbuf->b_length));
> -             for (i = 0; i < ninodes; i++) {
> +             for (i = 0; i < inodes_per_cluster; i++) {
>                       int     ioffset = i << mp->m_sb.sb_inodelog;
>                       uint    isize = xfs_dinode_size(version);
>  
> -- 
> 1.8.3.2
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

<Prev in Thread] Current Thread [Next in Thread>