xfs: pass xfs_da_args to xfs_attr_leaf_newentsize

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / fs / xfs / xfs_attr_leaf.c

diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index fe9587f..7761103 100644 (file)
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -711,6 +711,7 @@ xfs_attr_shortform_to_leaf(xfs_da_args_t *args)
 
        memset((char *)&nargs, 0, sizeof(nargs));
        nargs.dp = dp;
+       nargs.geo = args->geo;
        nargs.firstblock = args->firstblock;
        nargs.flist = args->flist;
        nargs.total = args->total;
@@ -838,6 +839,7 @@ xfs_attr3_leaf_to_shortform(
         * Copy the attributes
         */
        memset((char *)&nargs, 0, sizeof(nargs));
+       nargs.geo = args->geo;
        nargs.dp = dp;
        nargs.firstblock = args->firstblock;
        nargs.flist = args->flist;
@@ -1074,8 +1076,7 @@ xfs_attr3_leaf_add(
        leaf = bp->b_addr;
        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);
+       entsize = xfs_attr_leaf_newentsize(args, NULL);
 
        /*
         * Search through freemap for first-fit on new name length.
@@ -1177,14 +1178,11 @@ xfs_attr3_leaf_add_work(
        ASSERT(ichdr->freemap[mapindex].base < XFS_LBSIZE(mp));
        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));
+               xfs_attr_leaf_newentsize(args, 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);
+       ichdr->freemap[mapindex].size -= xfs_attr_leaf_newentsize(args, &tmp);
 
        entry->nameidx = cpu_to_be16(ichdr->freemap[mapindex].base +
                                     ichdr->freemap[mapindex].size);
@@ -1229,6 +1227,7 @@ xfs_attr3_leaf_add_work(
                name_rmt->valueblk = 0;
                args->rmtblkno = 1;
                args->rmtblkcnt = xfs_attr3_rmt_blocks(mp, args->valuelen);
+               args->rmtvaluelen = args->valuelen;
        }
        xfs_trans_log_buf(args->trans, bp,
             XFS_DA_LOGRANGE(leaf, xfs_attr3_leaf_name(leaf, args->index),
@@ -1591,9 +1590,7 @@ xfs_attr3_leaf_figure_balance(
        max = ichdr1->count + ichdr2->count;
        half = (max + 1) * sizeof(*entry);
        half += ichdr1->usedbytes + ichdr2->usedbytes +
-                       xfs_attr_leaf_newentsize(state->args->namelen,
-                                                state->args->valuelen,
-                                                state->blocksize, NULL);
+                       xfs_attr_leaf_newentsize(state->args, NULL);
        half /= 2;
        lastdelta = state->blocksize;
        entry = xfs_attr3_leaf_entryp(leaf1);
@@ -1605,10 +1602,7 @@ xfs_attr3_leaf_figure_balance(
                 */
                if (count == blk1->index) {
                        tmp = totallen + sizeof(*entry) +
-                               xfs_attr_leaf_newentsize(
-                                               state->args->namelen,
-                                               state->args->valuelen,
-                                               state->blocksize, NULL);
+                               xfs_attr_leaf_newentsize(state->args, NULL);
                        if (XFS_ATTR_ABS(half - tmp) > lastdelta)
                                break;
                        lastdelta = XFS_ATTR_ABS(half - tmp);
@@ -1644,10 +1638,7 @@ xfs_attr3_leaf_figure_balance(
        totallen -= count * sizeof(*entry);
        if (foundit) {
                totallen -= sizeof(*entry) +
-                               xfs_attr_leaf_newentsize(
-                                               state->args->namelen,
-                                               state->args->valuelen,
-                                               state->blocksize, NULL);
+                               xfs_attr_leaf_newentsize(state->args, NULL);
        }
 
        *countarg = count;
@@ -1946,7 +1937,7 @@ xfs_attr3_leaf_remove(
        tmp = ichdr.usedbytes + xfs_attr3_leaf_hdr_size(leaf) +
              ichdr.count * sizeof(xfs_attr_leaf_entry_t);
 
-       return tmp < mp->m_attr_magicpct; /* leaf is < 37% full */
+       return tmp < args->geo->magicpct; /* leaf is < 37% full */
 }
 
 /*
@@ -2167,11 +2158,11 @@ xfs_attr3_leaf_lookup_int(
                        if (!xfs_attr_namesp_match(args->flags, entry->flags))
                                continue;
                        args->index = probe;
-                       args->valuelen = be32_to_cpu(name_rmt->valuelen);
+                       args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen);
                        args->rmtblkno = be32_to_cpu(name_rmt->valueblk);
                        args->rmtblkcnt = xfs_attr3_rmt_blocks(
                                                        args->dp->i_mount,
-                                                       args->valuelen);
+                                                       args->rmtvaluelen);
                        return XFS_ERROR(EEXIST);
                }
        }
@@ -2220,19 +2211,19 @@ xfs_attr3_leaf_getvalue(
                name_rmt = xfs_attr3_leaf_name_remote(leaf, args->index);
                ASSERT(name_rmt->namelen == args->namelen);
                ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0);
-               valuelen = be32_to_cpu(name_rmt->valuelen);
+               args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen);
                args->rmtblkno = be32_to_cpu(name_rmt->valueblk);
                args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount,
-                                                      valuelen);
+                                                      args->rmtvaluelen);
                if (args->flags & ATTR_KERNOVAL) {
-                       args->valuelen = valuelen;
+                       args->valuelen = args->rmtvaluelen;
                        return 0;
                }
-               if (args->valuelen < valuelen) {
-                       args->valuelen = valuelen;
+               if (args->valuelen < args->rmtvaluelen) {
+                       args->valuelen = args->rmtvaluelen;
                        return XFS_ERROR(ERANGE);
                }
-               args->valuelen = valuelen;
+               args->valuelen = args->rmtvaluelen;
        }
        return 0;
 }
@@ -2438,22 +2429,21 @@ xfs_attr_leaf_entsize(xfs_attr_leafblock_t *leaf, int index)
  * a "local" or a "remote" attribute.
  */
 int
-xfs_attr_leaf_newentsize(int namelen, int valuelen, int blocksize, int *local)
+xfs_attr_leaf_newentsize(
+       struct xfs_da_args      *args,
+       int                     *local)
 {
-       int size;
+       int                     size;
 
-       size = xfs_attr_leaf_entsize_local(namelen, valuelen);
-       if (size < xfs_attr_leaf_entsize_local_max(blocksize)) {
-               if (local) {
+       size = xfs_attr_leaf_entsize_local(args->namelen, args->valuelen);
+       if (size < xfs_attr_leaf_entsize_local_max(args->geo->blksize)) {
+               if (local)
                        *local = 1;
-               }
-       } else {
-               size = xfs_attr_leaf_entsize_remote(namelen);
-               if (local) {
-                       *local = 0;
-               }
+               return size;
        }
-       return size;
+       if (local)
+               *local = 0;
+       return xfs_attr_leaf_entsize_remote(args->namelen);
 }
 
 
@@ -2519,7 +2509,7 @@ xfs_attr3_leaf_clearflag(
                ASSERT((entry->flags & XFS_ATTR_LOCAL) == 0);
                name_rmt = xfs_attr3_leaf_name_remote(leaf, args->index);
                name_rmt->valueblk = cpu_to_be32(args->rmtblkno);
-               name_rmt->valuelen = cpu_to_be32(args->valuelen);
+               name_rmt->valuelen = cpu_to_be32(args->rmtvaluelen);
                xfs_trans_log_buf(args->trans, bp,
                         XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt)));
        }
@@ -2677,7 +2667,7 @@ xfs_attr3_leaf_flipflags(
                ASSERT((entry1->flags & XFS_ATTR_LOCAL) == 0);
                name_rmt = xfs_attr3_leaf_name_remote(leaf1, args->index);
                name_rmt->valueblk = cpu_to_be32(args->rmtblkno);
-               name_rmt->valuelen = cpu_to_be32(args->valuelen);
+               name_rmt->valuelen = cpu_to_be32(args->rmtvaluelen);
                xfs_trans_log_buf(args->trans, bp1,
                         XFS_DA_LOGRANGE(leaf1, name_rmt, sizeof(*name_rmt)));
        }