From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 8CFA77F4E for ; Wed, 11 Dec 2013 20:22:13 -0600 (CST) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 6B5A18F8035 for ; Wed, 11 Dec 2013 18:22:10 -0800 (PST) Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by cuda.sgi.com with ESMTP id VjmwmyH8vsuyZ0Vb (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Wed, 11 Dec 2013 18:22:06 -0800 (PST) Message-ID: <52A91DC8.7010405@oracle.com> Date: Thu, 12 Dec 2013 10:22:00 +0800 From: Jeff Liu MIME-Version: 1.0 Subject: Re: [PATCH 1/5] xfs: introduce xfs_ialloc_blks_per_cluster References: <52A86D11.1040504@oracle.com> <20131211231409.GN10988@dastard> In-Reply-To: <20131211231409.GN10988@dastard> 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: Dave Chinner Cc: "xfs@oss.sgi.com" On 12/12 2013 07:14 AM, Dave Chinner wrote: > On Wed, Dec 11, 2013 at 09:48:01PM +0800, Jeff Liu wrote: >> From: Jie Liu >> >> Introduce a common routine xfs_ialloc_blks_per_cluster() to calculate >> and return the number of blocks per inode cluster. >> >> Signed-off-by: Jie Liu >> --- >> fs/xfs/xfs_ialloc.h | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/fs/xfs/xfs_ialloc.h b/fs/xfs/xfs_ialloc.h >> index a8f76a5..f4bfd32 100644 >> --- a/fs/xfs/xfs_ialloc.h >> +++ b/fs/xfs/xfs_ialloc.h >> @@ -37,6 +37,16 @@ struct xfs_btree_cur; >> #define XFS_INODE_BIG_CLUSTER_SIZE 8192 >> #define XFS_INODE_CLUSTER_SIZE(mp) (mp)->m_inode_cluster_size >> >> +/* Calculate and return the number of blocks per inode cluster */ >> +static inline int >> +xfs_ialloc_blks_per_cluster( >> + struct xfs_mount *mp) >> +{ >> + if (mp->m_sb.sb_blocksize >= XFS_INODE_CLUSTER_SIZE(mp)) >> + return 1; >> + return XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_blocklog; >> +} > > I'd avoid using the XFS_INODE_CLUSTER_SIZE() macro - it's just a > useless wrapper around mp->m_inode_cluster_size. Hence if you are > cleaning this code up, the first thing I'd do is remove the macro. > > /* Calculate and return the number of blocks per inode cluster */ > static inline int > xfs_ialloc_blks_per_cluster( > struct xfs_mount *mp) > { > if (mp->m_sb.sb_blocksize >= mp->m_inode_cluster_size) > return 1; > return mp->m_inode_cluster_size >> mp->m_sb.sb_blocklog; > } > > Is much less shouty, and just as easy to read ;) Yup, yup! I also considered to just remove this macros as mp->m_inode_cluster_size is quite understood and actually, we avoid this macros in xfs_inobp_check(). :) But that means I need to remove it from xlog_recover_buffer_pass2() and fix it's comments in this patch as well. Thanks, -Jeff _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs