hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IBEN7H CVE: NA -------------------------------- This is a preparation patch, the real fix patch has been revereted, so revert this patch as well. This reverts commit 295783fe564a5af258e04b8ee57e57b09d134858. Fixes: 94349af34627 ("xfs: atomic drop extent entries when inactiving attr") Signed-off-by: Long Li <leo.lilong@huawei.com> --- fs/xfs/libxfs/xfs_da_btree.c | 5 ++--- fs/xfs/libxfs/xfs_da_btree.h | 15 ++------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index 0443b0210772..12e3cca804b7 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -378,17 +378,16 @@ xfs_da3_node_set_type( } int -__xfs_da3_node_read( +xfs_da3_node_read( struct xfs_trans *tp, struct xfs_inode *dp, xfs_dablk_t bno, - unsigned int flags, struct xfs_buf **bpp, int whichfork) { int error; - error = xfs_da_read_buf(tp, dp, bno, flags, bpp, whichfork, + error = xfs_da_read_buf(tp, dp, bno, 0, bpp, whichfork, &xfs_da3_node_buf_ops); if (error || !*bpp || !tp) return error; diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h index 6d1da641f4f0..ffa3df5b2893 100644 --- a/fs/xfs/libxfs/xfs_da_btree.h +++ b/fs/xfs/libxfs/xfs_da_btree.h @@ -194,22 +194,11 @@ int xfs_da3_path_shift(xfs_da_state_t *state, xfs_da_state_path_t *path, */ int xfs_da3_blk_link(xfs_da_state_t *state, xfs_da_state_blk_t *old_blk, xfs_da_state_blk_t *new_blk); -int __xfs_da3_node_read(struct xfs_trans *tp, struct xfs_inode *dp, - xfs_dablk_t bno, unsigned int flags, - struct xfs_buf **bpp, int whichfork); +int xfs_da3_node_read(struct xfs_trans *tp, struct xfs_inode *dp, + xfs_dablk_t bno, struct xfs_buf **bpp, int whichfork); int xfs_da3_node_read_mapped(struct xfs_trans *tp, struct xfs_inode *dp, xfs_daddr_t mappedbno, struct xfs_buf **bpp, int whichfork); -static inline int -xfs_da3_node_read( - struct xfs_trans *tp, - struct xfs_inode *dp, - xfs_dablk_t bno, - struct xfs_buf **bpp, - int whichfork) -{ - return __xfs_da3_node_read(tp, dp, bno, 0, bpp, whichfork); -} /* * Utility routines. -- 2.39.2