From 0c7db4eca3e6519043c10288cb41f8a0ee634a0b Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 30 Nov 2018 12:38:54 -0500 Subject: Update bcachefs sources to 62de7539dc bcachefs: Make bkey types globally unique --- libbcachefs/acl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libbcachefs/acl.c') diff --git a/libbcachefs/acl.c b/libbcachefs/acl.c index 741e44ee..348060b2 100644 --- a/libbcachefs/acl.c +++ b/libbcachefs/acl.c @@ -23,9 +23,9 @@ static inline int acl_to_xattr_type(int type) { switch (type) { case ACL_TYPE_ACCESS: - return BCH_XATTR_INDEX_POSIX_ACL_ACCESS; + return KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS; case ACL_TYPE_DEFAULT: - return BCH_XATTR_INDEX_POSIX_ACL_DEFAULT; + return KEY_TYPE_XATTR_INDEX_POSIX_ACL_DEFAULT; default: BUG(); } @@ -351,7 +351,7 @@ int bch2_acl_chmod(struct btree_trans *trans, iter = bch2_hash_lookup(trans, bch2_xattr_hash_desc, &inode->ei_str_hash, inode->v.i_ino, - &X_SEARCH(BCH_XATTR_INDEX_POSIX_ACL_ACCESS, "", 0), + &X_SEARCH(KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS, "", 0), BTREE_ITER_INTENT); if (IS_ERR(iter)) return PTR_ERR(iter) != -ENOENT ? PTR_ERR(iter) : 0; -- cgit v1.2.3