From ca630f1d3767c20026b33ba1603017e5c8e9da5a Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 9 Jul 2023 14:12:58 -0400 Subject: bcachefs: Kill bch2_xattr_get() Inline it into the only caller Signed-off-by: Kent Overstreet --- fs/bcachefs/xattr.c | 11 ++--------- fs/bcachefs/xattr.h | 4 +--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/fs/bcachefs/xattr.c b/fs/bcachefs/xattr.c index 867cc6878248..43904c0ec9ba 100644 --- a/fs/bcachefs/xattr.c +++ b/fs/bcachefs/xattr.c @@ -166,13 +166,6 @@ err1: return ret < 0 && bch2_err_matches(ret, ENOENT) ? -ENODATA : ret; } -int bch2_xattr_get(struct bch_fs *c, struct bch_inode_info *inode, - const char *name, void *buffer, size_t size, int type) -{ - return bch2_trans_do(c, NULL, NULL, 0, - bch2_xattr_get_trans(&trans, inode, name, buffer, size, type)); -} - int bch2_xattr_set(struct btree_trans *trans, subvol_inum inum, const struct bch_hash_info *hash_info, const char *name, const void *value, size_t size, @@ -365,9 +358,9 @@ static int bch2_xattr_get_handler(const struct xattr_handler *handler, { struct bch_inode_info *inode = to_bch_ei(vinode); struct bch_fs *c = inode->v.i_sb->s_fs_info; - int ret; + int ret = bch2_trans_do(c, NULL, NULL, 0, + bch2_xattr_get_trans(&trans, inode, name, buffer, size, handler->flags)); - ret = bch2_xattr_get(c, inode, name, buffer, size, handler->flags); return bch2_err_class(ret); } diff --git a/fs/bcachefs/xattr.h b/fs/bcachefs/xattr.h index 214cbbaac304..ad568c06e1f8 100644 --- a/fs/bcachefs/xattr.h +++ b/fs/bcachefs/xattr.h @@ -38,9 +38,7 @@ struct xattr_handler; struct bch_hash_info; struct bch_inode_info; -int bch2_xattr_get(struct bch_fs *, struct bch_inode_info *, - const char *, void *, size_t, int); - +/* Exported for cmd_migrate.c in tools: */ int bch2_xattr_set(struct btree_trans *, subvol_inum, const struct bch_hash_info *, const char *, const void *, size_t, int, int); -- cgit v1.2.3