summaryrefslogtreecommitdiff
path: root/libbcachefs/acl.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2018-11-30 12:38:54 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2018-11-30 12:51:13 -0500
commit0c7db4eca3e6519043c10288cb41f8a0ee634a0b (patch)
treefd788cd46ea5b14e287b48677a94384a5abcce27 /libbcachefs/acl.c
parentbca8b084ad754afc54e628d9db7721b90d9480b7 (diff)
Update bcachefs sources to 62de7539dc bcachefs: Make bkey types globally unique
Diffstat (limited to 'libbcachefs/acl.c')
-rw-r--r--libbcachefs/acl.c6
1 files changed, 3 insertions, 3 deletions
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;