From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 17DFA7F4E for ; Wed, 11 Dec 2013 17:31:06 -0600 (CST) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 0185F30407A for ; Wed, 11 Dec 2013 15:31:05 -0800 (PST) Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net [150.101.137.145]) by cuda.sgi.com with ESMTP id Y0oKAVwyz4xB6isJ for ; Wed, 11 Dec 2013 15:31:04 -0800 (PST) Date: Thu, 12 Dec 2013 10:31:01 +1100 From: Dave Chinner Subject: Re: [PATCH 4/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_ifree_cluster Message-ID: <20131211233101.GQ10988@dastard> References: <52A86D2B.50409@oracle.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <52A86D2B.50409@oracle.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Jeff Liu Cc: "xfs@oss.sgi.com" On Wed, Dec 11, 2013 at 09:48:27PM +0800, Jeff Liu wrote: > From: Jie Liu > > Use xfs_ialloc_blks_per_cluster() in xfs_ifree_cluster() > > Signed-off-by: Jie Liu > --- > fs/xfs/xfs_inode.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index 001aa89..7e75b8e 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -2152,16 +2152,9 @@ xfs_ifree_cluster( > struct xfs_perag *pag; > > pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, inum)); > - if (mp->m_sb.sb_blocksize >= XFS_INODE_CLUSTER_SIZE(mp)) { > - blks_per_cluster = 1; > - ninodes = mp->m_sb.sb_inopblock; > - nbufs = XFS_IALLOC_BLOCKS(mp); > - } else { > - blks_per_cluster = XFS_INODE_CLUSTER_SIZE(mp) / > - mp->m_sb.sb_blocksize; > - ninodes = blks_per_cluster * mp->m_sb.sb_inopblock; > - nbufs = XFS_IALLOC_BLOCKS(mp) / blks_per_cluster; > - } > + blks_per_cluster = xfs_ialloc_blks_per_cluster(mp); > + ninodes = blks_per_cluster << mp->m_sb.sb_inopblog; > + nbufs = XFS_IALLOC_BLOCKS(mp) / blks_per_cluster; I'd get rid of the XFS_IALLOC_BLOCKS() macros there and just use mp->m_ialloc_blks directly. Otherwise looks good. Reviewed-by: Dave Chinner -- Dave Chinner david@fromorbit.com _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs