提交 9df2dd0b 编写于 作者: E Eric Sandeen 提交者: Dave Chinner

xfs: remove unused tp arg from xfs_da_reada_buf & callers

This one hits a few functions as we unravel the unused arg
up through the callers.
Signed-off-by: NEric Sandeen <sandeen@redhat.com>
Reviewed-by: NDave Chinner <dchinner@redhat.com>
Signed-off-by: NDave Chinner <david@fromorbit.com>
上级 72b0636b
...@@ -2462,7 +2462,6 @@ xfs_buf_map_from_irec( ...@@ -2462,7 +2462,6 @@ xfs_buf_map_from_irec(
*/ */
static int static int
xfs_dabuf_map( xfs_dabuf_map(
struct xfs_trans *trans,
struct xfs_inode *dp, struct xfs_inode *dp,
xfs_dablk_t bno, xfs_dablk_t bno,
xfs_daddr_t mappedbno, xfs_daddr_t mappedbno,
...@@ -2558,7 +2557,7 @@ xfs_da_get_buf( ...@@ -2558,7 +2557,7 @@ xfs_da_get_buf(
*bpp = NULL; *bpp = NULL;
mapp = &map; mapp = &map;
nmap = 1; nmap = 1;
error = xfs_dabuf_map(trans, dp, bno, mappedbno, whichfork, error = xfs_dabuf_map(dp, bno, mappedbno, whichfork,
&mapp, &nmap); &mapp, &nmap);
if (error) { if (error) {
/* mapping a hole is not an error, but we don't continue */ /* mapping a hole is not an error, but we don't continue */
...@@ -2606,7 +2605,7 @@ xfs_da_read_buf( ...@@ -2606,7 +2605,7 @@ xfs_da_read_buf(
*bpp = NULL; *bpp = NULL;
mapp = &map; mapp = &map;
nmap = 1; nmap = 1;
error = xfs_dabuf_map(trans, dp, bno, mappedbno, whichfork, error = xfs_dabuf_map(dp, bno, mappedbno, whichfork,
&mapp, &nmap); &mapp, &nmap);
if (error) { if (error) {
/* mapping a hole is not an error, but we don't continue */ /* mapping a hole is not an error, but we don't continue */
...@@ -2679,7 +2678,6 @@ xfs_da_read_buf( ...@@ -2679,7 +2678,6 @@ xfs_da_read_buf(
*/ */
xfs_daddr_t xfs_daddr_t
xfs_da_reada_buf( xfs_da_reada_buf(
struct xfs_trans *trans,
struct xfs_inode *dp, struct xfs_inode *dp,
xfs_dablk_t bno, xfs_dablk_t bno,
xfs_daddr_t mappedbno, xfs_daddr_t mappedbno,
...@@ -2693,7 +2691,7 @@ xfs_da_reada_buf( ...@@ -2693,7 +2691,7 @@ xfs_da_reada_buf(
mapp = &map; mapp = &map;
nmap = 1; nmap = 1;
error = xfs_dabuf_map(trans, dp, bno, mappedbno, whichfork, error = xfs_dabuf_map(dp, bno, mappedbno, whichfork,
&mapp, &nmap); &mapp, &nmap);
if (error) { if (error) {
/* mapping a hole is not an error, but we don't continue */ /* mapping a hole is not an error, but we don't continue */
......
...@@ -183,9 +183,9 @@ int xfs_da_read_buf(struct xfs_trans *trans, struct xfs_inode *dp, ...@@ -183,9 +183,9 @@ int xfs_da_read_buf(struct xfs_trans *trans, struct xfs_inode *dp,
xfs_dablk_t bno, xfs_daddr_t mappedbno, xfs_dablk_t bno, xfs_daddr_t mappedbno,
struct xfs_buf **bpp, int whichfork, struct xfs_buf **bpp, int whichfork,
const struct xfs_buf_ops *ops); const struct xfs_buf_ops *ops);
xfs_daddr_t xfs_da_reada_buf(struct xfs_trans *trans, struct xfs_inode *dp, xfs_daddr_t xfs_da_reada_buf(struct xfs_inode *dp, xfs_dablk_t bno,
xfs_dablk_t bno, xfs_daddr_t mapped_bno, xfs_daddr_t mapped_bno, int whichfork,
int whichfork, const struct xfs_buf_ops *ops); const struct xfs_buf_ops *ops);
int xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno, int xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno,
struct xfs_buf *dead_buf); struct xfs_buf *dead_buf);
......
...@@ -329,12 +329,11 @@ xfs_dir3_data_read( ...@@ -329,12 +329,11 @@ xfs_dir3_data_read(
int int
xfs_dir3_data_readahead( xfs_dir3_data_readahead(
struct xfs_trans *tp,
struct xfs_inode *dp, struct xfs_inode *dp,
xfs_dablk_t bno, xfs_dablk_t bno,
xfs_daddr_t mapped_bno) xfs_daddr_t mapped_bno)
{ {
return xfs_da_reada_buf(tp, dp, bno, mapped_bno, return xfs_da_reada_buf(dp, bno, mapped_bno,
XFS_DATA_FORK, &xfs_dir3_data_reada_buf_ops); XFS_DATA_FORK, &xfs_dir3_data_reada_buf_ops);
} }
......
...@@ -54,8 +54,8 @@ extern int xfs_dir2_leaf_to_block(struct xfs_da_args *args, ...@@ -54,8 +54,8 @@ extern int xfs_dir2_leaf_to_block(struct xfs_da_args *args,
extern int __xfs_dir3_data_check(struct xfs_inode *dp, struct xfs_buf *bp); extern int __xfs_dir3_data_check(struct xfs_inode *dp, struct xfs_buf *bp);
extern int xfs_dir3_data_read(struct xfs_trans *tp, struct xfs_inode *dp, extern int xfs_dir3_data_read(struct xfs_trans *tp, struct xfs_inode *dp,
xfs_dablk_t bno, xfs_daddr_t mapped_bno, struct xfs_buf **bpp); xfs_dablk_t bno, xfs_daddr_t mapped_bno, struct xfs_buf **bpp);
extern int xfs_dir3_data_readahead(struct xfs_trans *tp, struct xfs_inode *dp, extern int xfs_dir3_data_readahead(struct xfs_inode *dp, xfs_dablk_t bno,
xfs_dablk_t bno, xfs_daddr_t mapped_bno); xfs_daddr_t mapped_bno);
extern struct xfs_dir2_data_free * extern struct xfs_dir2_data_free *
xfs_dir2_data_freeinsert(struct xfs_dir2_data_hdr *hdr, xfs_dir2_data_freeinsert(struct xfs_dir2_data_hdr *hdr,
......
...@@ -434,7 +434,7 @@ xfs_dir2_leaf_readbuf( ...@@ -434,7 +434,7 @@ xfs_dir2_leaf_readbuf(
*/ */
if (i > mip->ra_current && if (i > mip->ra_current &&
map[mip->ra_index].br_blockcount >= mp->m_dirblkfsbs) { map[mip->ra_index].br_blockcount >= mp->m_dirblkfsbs) {
xfs_dir3_data_readahead(NULL, dp, xfs_dir3_data_readahead(dp,
map[mip->ra_index].br_startoff + mip->ra_offset, map[mip->ra_index].br_startoff + mip->ra_offset,
XFS_FSB_TO_DADDR(mp, XFS_FSB_TO_DADDR(mp,
map[mip->ra_index].br_startblock + map[mip->ra_index].br_startblock +
...@@ -447,7 +447,7 @@ xfs_dir2_leaf_readbuf( ...@@ -447,7 +447,7 @@ xfs_dir2_leaf_readbuf(
* use our mapping, but this is a very rare case. * use our mapping, but this is a very rare case.
*/ */
else if (i > mip->ra_current) { else if (i > mip->ra_current) {
xfs_dir3_data_readahead(NULL, dp, xfs_dir3_data_readahead(dp,
map[mip->ra_index].br_startoff + map[mip->ra_index].br_startoff +
mip->ra_offset, -1); mip->ra_offset, -1);
mip->ra_current = i; mip->ra_current = i;
......
...@@ -936,7 +936,7 @@ xfs_dir_open( ...@@ -936,7 +936,7 @@ xfs_dir_open(
*/ */
mode = xfs_ilock_data_map_shared(ip); mode = xfs_ilock_data_map_shared(ip);
if (ip->i_d.di_nextents > 0) if (ip->i_d.di_nextents > 0)
xfs_dir3_data_readahead(NULL, ip, 0, -1); xfs_dir3_data_readahead(ip, 0, -1);
xfs_iunlock(ip, mode); xfs_iunlock(ip, mode);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册