* [PATCH 4/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_ifree_cluster
@ 2013-12-11 13:48 Jeff Liu
2013-12-11 23:31 ` 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_ifree_cluster()
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
---
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;
for (j = 0; j < nbufs; j++, inum += ninodes) {
blkno = XFS_AGB_TO_DADDR(mp, XFS_INO_TO_AGNO(mp, inum),
--
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 4/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_ifree_cluster
2013-12-11 13:48 [PATCH 4/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_ifree_cluster Jeff Liu
@ 2013-12-11 23:31 ` Dave Chinner
2013-12-12 3:06 ` Jeff Liu
0 siblings, 1 reply; 3+ messages in thread
From: Dave Chinner @ 2013-12-11 23:31 UTC (permalink / raw)
To: Jeff Liu; +Cc: xfs@oss.sgi.com
On Wed, Dec 11, 2013 at 09:48:27PM +0800, Jeff Liu wrote:
> From: Jie Liu <jeff.liu@oracle.com>
>
> Use xfs_ialloc_blks_per_cluster() in xfs_ifree_cluster()
>
> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> ---
> 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 <dchinner@redhat.com>
--
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 4/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_ifree_cluster
2013-12-11 23:31 ` Dave Chinner
@ 2013-12-12 3:06 ` Jeff Liu
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Liu @ 2013-12-12 3:06 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs@oss.sgi.com
On 12/12 2013 07:31 AM, Dave Chinner wrote:
> On Wed, Dec 11, 2013 at 09:48:27PM +0800, Jeff Liu wrote:
>> From: Jie Liu <jeff.liu@oracle.com>
>>
>> Use xfs_ialloc_blks_per_cluster() in xfs_ifree_cluster()
>>
>> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
>> ---
>> 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.
Agree, for the same reason as XFS_INODE_CLUSTER_SIZE() macros, I will
kill it. Oh, it looks we can get rid of XFS_IALLOC_INODES() marcos as
well...
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:06 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 4/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_ifree_cluster Jeff Liu
2013-12-11 23:31 ` Dave Chinner
2013-12-12 3:06 ` Jeff Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox