summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-07-09 21:12:58 +0300
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-23 00:10:06 +0300
commitca630f1d3767c20026b33ba1603017e5c8e9da5a (patch)
tree39936f9a6f16992a63713667474565b12e3eb8b1
parente8ee5cc733319496cbe8a97bc75ccdb6058d2da7 (diff)
downloadlinux-ca630f1d3767c20026b33ba1603017e5c8e9da5a.tar.xz
bcachefs: Kill bch2_xattr_get()
Inline it into the only caller Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r--fs/bcachefs/xattr.c11
-rw-r--r--fs/bcachefs/xattr.h4
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);