hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: remove unnecesary lshift/rshift key initialization 

In the lshift/rshift functions we don't use the key variable for
anything now, so remove the variable and its initializer.  The
update_keys functions figure out the key for a block on their own.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Darrick J. Wong 2016-08-03 12:22:45 +10:00 committed by Dave Chinner
parent 973b83194b
commit 1f704b2b47
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/xfs/libxfs/xfs_btree.c
View File

@ -2249,7 +2249,6 @@ xfs_btree_lshift(
int level, int level,
int *stat) /* success/failure */ int *stat) /* success/failure */
{ {
union xfs_btree_key key; /* btree key */
struct xfs_buf *lbp; /* left buffer pointer */ struct xfs_buf *lbp; /* left buffer pointer */
struct xfs_btree_block *left; /* left btree block */ struct xfs_btree_block *left; /* left btree block */
int lrecs; /* left record count */ int lrecs; /* left record count */
@ -2392,13 +2391,6 @@ xfs_btree_lshift(
xfs_btree_rec_addr(cur, 2, right), xfs_btree_rec_addr(cur, 2, right),
-1, rrecs); -1, rrecs);
xfs_btree_log_recs(cur, rbp, 1, rrecs); xfs_btree_log_recs(cur, rbp, 1, rrecs);
/*
* If it's the first record in the block, we'll need a key
* structure to pass up to the next level (updkey).
*/
cur->bc_ops->init_key_from_rec(&key,
xfs_btree_rec_addr(cur, 1, right));
} }
/* /*
@ -2461,7 +2453,6 @@ xfs_btree_rshift(
int level, int level,
int *stat) /* success/failure */ int *stat) /* success/failure */
{ {
union xfs_btree_key key; /* btree key */
struct xfs_buf *lbp; /* left buffer pointer */ struct xfs_buf *lbp; /* left buffer pointer */
struct xfs_btree_block *left; /* left btree block */ struct xfs_btree_block *left; /* left btree block */
struct xfs_buf *rbp; /* right buffer pointer */ struct xfs_buf *rbp; /* right buffer pointer */
@ -2570,11 +2561,6 @@ xfs_btree_rshift(
/* Now put the new data in, and log it. */ /* Now put the new data in, and log it. */
xfs_btree_copy_recs(cur, rrp, lrp, 1); xfs_btree_copy_recs(cur, rrp, lrp, 1);
xfs_btree_log_recs(cur, rbp, 1, rrecs + 1); xfs_btree_log_recs(cur, rbp, 1, rrecs + 1);
cur->bc_ops->init_key_from_rec(&key, rrp);
ASSERT(cur->bc_ops->recs_inorder(cur, rrp,
xfs_btree_rec_addr(cur, 2, right)));
} }
/* /*