xfs
[Top] [All Lists]

[PATCH 15/18] xfs: use xfs_da_geometry for block size in attr code

To: xfs@xxxxxxxxxxx
Subject: [PATCH 15/18] xfs: use xfs_da_geometry for block size in attr code
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Thu, 8 May 2014 18:19:45 +1000
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1399537188-26509-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1399537188-26509-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

Rather than using the superblock value obtained through the
xfs_mount.

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
 fs/xfs/xfs_attr.c       | 24 +++++++++++-------------
 fs/xfs/xfs_attr_leaf.c  |  6 +++---
 fs/xfs/xfs_log_rlimit.c |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 28b6bb3..ab2679a 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -187,12 +187,10 @@ xfs_attr_get(
  */
 STATIC int
 xfs_attr_calc_size(
-       struct xfs_inode        *ip,
-       int                     namelen,
-       int                     valuelen,
+       struct xfs_da_args      *args,
        int                     *local)
 {
-       struct xfs_mount        *mp = ip->i_mount;
+       struct xfs_mount        *mp = args->dp->i_mount;
        int                     size;
        int                     nblks;
 
@@ -200,12 +198,12 @@ xfs_attr_calc_size(
         * Determine space new attribute will use, and if it would be
         * "local" or "remote" (note: local != inline).
         */
-       size = xfs_attr_leaf_newentsize(namelen, valuelen,
-                                       mp->m_sb.sb_blocksize, local);
+       size = xfs_attr_leaf_newentsize(args->namelen, args->valuelen,
+                                       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;
                }
@@ -214,7 +212,7 @@ xfs_attr_calc_size(
                 * Out of line attribute, cannot double split, but
                 * make room for the attribute value itself.
                 */
-               uint    dblocks = xfs_attr3_rmt_blocks(mp, valuelen);
+               uint    dblocks = xfs_attr3_rmt_blocks(mp, args->valuelen);
                nblks += dblocks;
                nblks += XFS_NEXTENTADD_SPACE_RES(mp, dblocks, XFS_ATTR_FORK);
        }
@@ -276,7 +274,7 @@ xfs_attr_set_int(
        args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
 
        /* Size is now blocks for attribute data */
-       args.total = xfs_attr_calc_size(dp, name->len, valuelen, &local);
+       args.total = xfs_attr_calc_size(&args, &local);
 
        /*
         * Start our first transaction of the day.
@@ -994,7 +992,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;
 
        /*
@@ -1173,7 +1171,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);
@@ -1265,7 +1263,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;
 
        /*
@@ -1528,7 +1526,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 d1e800d..ab652e9 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -1076,7 +1076,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.
@@ -1179,13 +1179,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

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