All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Foster <bfoster@redhat.com>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 14/16] xfs: use xfs_da_geometry for block size in attr code
Date: Tue, 27 May 2014 12:01:01 -0400	[thread overview]
Message-ID: <20140527160100.GF11265@laptop.bfoster> (raw)
In-Reply-To: <1400803432-20048-15-git-send-email-david@fromorbit.com>

On Fri, May 23, 2014 at 10:03:50AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> Rather than using the superblock value obtained through the
> xfs_mount.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  fs/xfs/xfs_attr.c       | 12 ++++++------
>  fs/xfs/xfs_attr_leaf.c  |  6 +++---
>  fs/xfs/xfs_log_rlimit.c |  2 +-
>  3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
> index 8bb9ae6..ccfc2c9 100644
> --- a/fs/xfs/xfs_attr.c
> +++ b/fs/xfs/xfs_attr.c
> @@ -175,11 +175,11 @@ xfs_attr_calc_size(
>  	 * "local" or "remote" (note: local != inline).
>  	 */
>  	size = xfs_attr_leaf_newentsize(args->namelen, args->valuelen,
> -					mp->m_sb.sb_blocksize, local);
> +					args->geo->blksize, local);
>  
>  	nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK);
>  	if (*local) {
> -		if (size > (mp->m_sb.sb_blocksize >> 1)) {
> +		if (size > (args->geo->blksize / 2)) {
>  			/* Double split possible */
>  			nblks *= 2;
>  		}
> @@ -898,7 +898,7 @@ restart:
>  	state = xfs_da_state_alloc();
>  	state->args = args;
>  	state->mp = mp;
> -	state->blocksize = state->mp->m_sb.sb_blocksize;
> +	state->blocksize = args->geo->blksize;
>  	state->node_ents = args->geo->node_ents;
>  
>  	/*
> @@ -1077,7 +1077,7 @@ restart:
>  		state = xfs_da_state_alloc();
>  		state->args = args;
>  		state->mp = mp;
> -		state->blocksize = state->mp->m_sb.sb_blocksize;
> +		state->blocksize = args->geo->blksize;
>  		state->node_ents = args->geo->node_ents;
>  		state->inleaf = 0;
>  		error = xfs_da3_node_lookup_int(state, &retval);
> @@ -1169,7 +1169,7 @@ xfs_attr_node_removename(xfs_da_args_t *args)
>  	state = xfs_da_state_alloc();
>  	state->args = args;
>  	state->mp = dp->i_mount;
> -	state->blocksize = state->mp->m_sb.sb_blocksize;
> +	state->blocksize = args->geo->blksize;
>  	state->node_ents = args->geo->node_ents;
>  
>  	/*
> @@ -1432,7 +1432,7 @@ xfs_attr_node_get(xfs_da_args_t *args)
>  	state = xfs_da_state_alloc();
>  	state->args = args;
>  	state->mp = args->dp->i_mount;
> -	state->blocksize = state->mp->m_sb.sb_blocksize;
> +	state->blocksize = args->geo->blksize;
>  	state->node_ents = args->geo->node_ents;
>  
>  	/*
> diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
> index 5be77b3..88cd84a 100644
> --- a/fs/xfs/xfs_attr_leaf.c
> +++ b/fs/xfs/xfs_attr_leaf.c
> @@ -1077,7 +1077,7 @@ xfs_attr3_leaf_add(
>  	xfs_attr3_leaf_hdr_from_disk(&ichdr, leaf);
>  	ASSERT(args->index >= 0 && args->index <= ichdr.count);
>  	entsize = xfs_attr_leaf_newentsize(args->namelen, args->valuelen,
> -			   args->trans->t_mountp->m_sb.sb_blocksize, NULL);
> +			   args->geo->blksize, NULL);
>  
>  	/*
>  	 * Search through freemap for first-fit on new name length.
> @@ -1180,13 +1180,13 @@ xfs_attr3_leaf_add_work(
>  	ASSERT((ichdr->freemap[mapindex].base & 0x3) == 0);
>  	ASSERT(ichdr->freemap[mapindex].size >=
>  		xfs_attr_leaf_newentsize(args->namelen, args->valuelen,
> -					 mp->m_sb.sb_blocksize, NULL));
> +					 args->geo->blksize, NULL));
>  	ASSERT(ichdr->freemap[mapindex].size < XFS_LBSIZE(mp));
>  	ASSERT((ichdr->freemap[mapindex].size & 0x3) == 0);
>  
>  	ichdr->freemap[mapindex].size -=
>  			xfs_attr_leaf_newentsize(args->namelen, args->valuelen,
> -						 mp->m_sb.sb_blocksize, &tmp);
> +						 args->geo->blksize, &tmp);
>  
>  	entry->nameidx = cpu_to_be16(ichdr->freemap[mapindex].base +
>  				     ichdr->freemap[mapindex].size);
> diff --git a/fs/xfs/xfs_log_rlimit.c b/fs/xfs/xfs_log_rlimit.c
> index 2af1a0a..ee7e0e8 100644
> --- a/fs/xfs/xfs_log_rlimit.c
> +++ b/fs/xfs/xfs_log_rlimit.c
> @@ -42,7 +42,7 @@ xfs_log_calc_max_attrsetm_res(
>  	int			size;
>  	int			nblks;
>  
> -	size = xfs_attr_leaf_entsize_local_max(mp->m_sb.sb_blocksize) -
> +	size = xfs_attr_leaf_entsize_local_max(mp->m_attr_geo->blksize) -
>  	       MAXNAMELEN - 1;
>  	nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK);
>  	nblks += XFS_B_TO_FSB(mp, size);
> -- 
> 1.9.0
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

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

  reply	other threads:[~2014-05-27 16:01 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-23  0:03 [PATCH 00/16 V2] xfs: introduce struct xfs_da_geometry Dave Chinner
2014-05-23  0:03 ` [PATCH 01/16] xfs: introduce directory geometry structure Dave Chinner
2014-05-23 19:04   ` Brian Foster
2014-05-26  4:28     ` Dave Chinner
2014-05-26 13:29       ` Brian Foster
2014-05-26 21:39         ` Dave Chinner
2014-05-23  0:03 ` [PATCH 02/16] xfs: move directory block translatiosn to xfs_da_btree.h Dave Chinner
2014-05-23 19:05   ` Brian Foster
2014-05-27 10:46   ` Christoph Hellwig
2014-05-27 23:06     ` Dave Chinner
2014-05-28  5:28       ` Christoph Hellwig
2014-05-28  5:39         ` Dave Chinner
2014-05-23  0:03 ` [PATCH 03/16] xfs: kill XFS_DIR2...FIRSTDB macros Dave Chinner
2014-05-23 19:05   ` Brian Foster
2014-05-27 10:47   ` Christoph Hellwig
2014-05-23  0:03 ` [PATCH 04/16] xfs: convert dir byte/off conversion to xfs_da_geometry Dave Chinner
2014-05-23 19:05   ` Brian Foster
2014-05-23  0:03 ` [PATCH 05/16] xfs: convert directory dablk " Dave Chinner
2014-05-23 19:06   ` Brian Foster
2014-05-26  4:48     ` Dave Chinner
2014-05-23  0:03 ` [PATCH 06/16] xfs: convert directory db " Dave Chinner
2014-05-23 19:07   ` Brian Foster
2014-05-23  0:03 ` [PATCH 07/16] xfs: convert directory segment limits " Dave Chinner
2014-05-23 20:43   ` Brian Foster
2014-05-23  0:03 ` [PATCH 08/16] xfs: convert m_dirblkfsbs " Dave Chinner
2014-05-23 20:43   ` Brian Foster
2014-05-23  0:03 ` [PATCH 09/16] xfs: convert m_dirblksize " Dave Chinner
2014-05-27 15:59   ` Brian Foster
2014-05-23  0:03 ` [PATCH 10/16] xfs: convert dir/attr btree threshold " Dave Chinner
2014-05-27 15:59   ` Brian Foster
2014-05-23  0:03 ` [PATCH 11/16] xfs: move node entry counts " Dave Chinner
2014-05-27 15:59   ` Brian Foster
2014-05-27 23:47     ` Dave Chinner
2014-05-23  0:03 ` [PATCH 12/16] xfs: reduce direct usage of mp->m_dir_geo Dave Chinner
2014-05-27 15:59   ` Brian Foster
2014-05-27 23:53     ` Dave Chinner
2014-05-23  0:03 ` [PATCH 13/16] xfs: remove mp->m_dir_geo from directory logging Dave Chinner
2014-05-27 16:00   ` Brian Foster
2014-05-23  0:03 ` [PATCH 14/16] xfs: use xfs_da_geometry for block size in attr code Dave Chinner
2014-05-27 16:01   ` Brian Foster [this message]
2014-05-23  0:03 ` [PATCH 15/16] xfs: pass xfs_da_args to xfs_attr_leaf_newentsize Dave Chinner
2014-05-27 16:01   ` Brian Foster
2014-05-23  0:03 ` [PATCH 16/16] xfs: repalce attr LBSIZE with xfs_da_geometry Dave Chinner
2014-05-27 16:01   ` Brian Foster
  -- strict thread matches above, loose matches on Subject: below --
2014-05-28  6:04 [PATCH 00/16 V3] xfs: introduce struct xfs_da_geometry Dave Chinner
2014-05-28  6:04 ` [PATCH 14/16] xfs: use xfs_da_geometry for block size in attr code Dave Chinner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140527160100.GF11265@laptop.bfoster \
    --to=bfoster@redhat.com \
    --cc=david@fromorbit.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.