]> git.baikalelectronics.ru Git - kernel.git/commit
xfs: remove boilerplate around xfs_btree_init_block
authorEric Sandeen <sandeen@sandeen.net>
Sat, 28 Jan 2017 07:16:39 +0000 (23:16 -0800)
committerDarrick J. Wong <darrick.wong@oracle.com>
Tue, 31 Jan 2017 00:32:24 +0000 (16:32 -0800)
commit45486842d133f7b2d1b1e52a106eb44fb970cdfa
tree836dd90f7b2d3d412eb5782e1b1fc463e9d9fd4c
parenta1ec61876ee59ea256e780643842ac22f21e0d14
xfs: remove boilerplate around xfs_btree_init_block

Now that xfs_btree_init_block_int is able to determine crc
status from the passed-in mp, we can determine the proper
magic as well if we are given a btree number, rather than
an explicit magic value.

Change xfs_btree_init_block[_int] callers to pass in the
btree number, and let xfs_btree_init_block_int use the
xfs_magics array via the xfs_btree_magic macro to determine
which magic value is needed.  This makes all of the
if (crc) / else stanzas identical, and the if/else can be
removed, leading to a single, common init_block call.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/libxfs/xfs_bmap_btree.c
fs/xfs/libxfs/xfs_btree.c
fs/xfs/libxfs/xfs_btree.h
fs/xfs/xfs_fsops.c