Update bcachefs sources to 386f00b639 bcachefs: Snapshot creation, deletion

[bcachefs-tools-debian] / libbcachefs / acl.c

diff --git a/libbcachefs/acl.c b/libbcachefs/acl.c
index 5408a9225fe50025af1badea356541c6422d10cb..f92b52e49254d32c34ae1316bb24e685011064fc 100644 (file)
--- a/libbcachefs/acl.c
+++ b/libbcachefs/acl.c
@@ -218,44 +218,52 @@ struct posix_acl *bch2_get_acl(struct inode *vinode, int type)
        struct bch_fs *c = inode->v.i_sb->s_fs_info;
        struct bch_hash_info hash = bch2_hash_info_init(c, &inode->ei_inode);
        struct btree_trans trans;
-       struct btree_iter *iter;
+       struct btree_iter iter = { NULL };
        struct bkey_s_c_xattr xattr;
        struct posix_acl *acl = NULL;
+       struct bkey_s_c k;
+       int ret;
 
        bch2_trans_init(&trans, c, 0, 0);
 retry:
        bch2_trans_begin(&trans);
 
-       iter = bch2_hash_lookup(&trans, bch2_xattr_hash_desc,
-                       &hash, inode->v.i_ino,
+       ret = bch2_hash_lookup(&trans, &iter, bch2_xattr_hash_desc,
+                       &hash, inode_inum(inode),
                        &X_SEARCH(acl_to_xattr_type(type), "", 0),
                        0);
-       if (IS_ERR(iter)) {
-               if (PTR_ERR(iter) == -EINTR)
+       if (ret) {
+               if (ret == -EINTR)
                        goto retry;
+               if (ret != -ENOENT)
+                       acl = ERR_PTR(ret);
+               goto out;
+       }
 
-               if (PTR_ERR(iter) != -ENOENT)
-                       acl = ERR_CAST(iter);
+       k = bch2_btree_iter_peek_slot(&iter);
+       ret = bkey_err(k);
+       if (ret) {
+               acl = ERR_PTR(ret);
                goto out;
        }
 
-       xattr = bkey_s_c_to_xattr(bch2_btree_iter_peek_slot(iter));
+       xattr = bkey_s_c_to_xattr(k);
        acl = bch2_acl_from_disk(xattr_val(xattr.v),
                        le16_to_cpu(xattr.v->x_val_len));
 
        if (!IS_ERR(acl))
                set_cached_acl(&inode->v, type, acl);
-       bch2_trans_iter_put(&trans, iter);
 out:
+       bch2_trans_iter_exit(&trans, &iter);
        bch2_trans_exit(&trans);
        return acl;
 }
 
-int bch2_set_acl_trans(struct btree_trans *trans,
+int bch2_set_acl_trans(struct btree_trans *trans, subvol_inum inum,
                       struct bch_inode_unpacked *inode_u,
-                      const struct bch_hash_info *hash_info,
                       struct posix_acl *acl, int type)
 {
+       struct bch_hash_info hash_info = bch2_hash_info_init(trans->c, inode_u);
        int ret;
 
        if (type == ACL_TYPE_DEFAULT &&
@@ -268,14 +276,14 @@ int bch2_set_acl_trans(struct btree_trans *trans,
                if (IS_ERR(xattr))
                        return PTR_ERR(xattr);
 
-               ret = bch2_hash_set(trans, bch2_xattr_hash_desc, hash_info,
-                                   inode_u->bi_inum, &xattr->k_i, 0);
+               ret = bch2_hash_set(trans, bch2_xattr_hash_desc, &hash_info,
+                                   inum, &xattr->k_i, 0);
        } else {
                struct xattr_search_key search =
                        X_SEARCH(acl_to_xattr_type(type), "", 0);
 
-               ret = bch2_hash_delete(trans, bch2_xattr_hash_desc, hash_info,
-                                      inode_u->bi_inum, &search);
+               ret = bch2_hash_delete(trans, bch2_xattr_hash_desc, &hash_info,
+                                      inum, &search);
        }
 
        return ret == -ENOENT ? 0 : ret;
@@ -287,9 +295,8 @@ int bch2_set_acl(struct user_namespace *mnt_userns,
        struct bch_inode_info *inode = to_bch_ei(vinode);
        struct bch_fs *c = inode->v.i_sb->s_fs_info;
        struct btree_trans trans;
-       struct btree_iter *inode_iter;
+       struct btree_iter inode_iter = { NULL };
        struct bch_inode_unpacked inode_u;
-       struct bch_hash_info hash_info;
        struct posix_acl *acl;
        umode_t mode;
        int ret;
@@ -300,9 +307,8 @@ retry:
        bch2_trans_begin(&trans);
        acl = _acl;
 
-       inode_iter = bch2_inode_peek(&trans, &inode_u, inode->v.i_ino,
-                                    BTREE_ITER_INTENT);
-       ret = PTR_ERR_OR_ZERO(inode_iter);
+       ret = bch2_inode_peek(&trans, &inode_iter, &inode_u, inode_inum(inode),
+                             BTREE_ITER_INTENT);
        if (ret)
                goto btree_err;
 
@@ -314,21 +320,18 @@ retry:
                        goto btree_err;
        }
 
-       hash_info = bch2_hash_info_init(c, &inode_u);
-
-       ret = bch2_set_acl_trans(&trans, &inode_u, &hash_info, acl, type);
+       ret = bch2_set_acl_trans(&trans, inode_inum(inode), &inode_u, acl, type);
        if (ret)
                goto btree_err;
 
        inode_u.bi_ctime        = bch2_current_time(c);
        inode_u.bi_mode         = mode;
 
-       ret =   bch2_inode_write(&trans, inode_iter, &inode_u) ?:
+       ret =   bch2_inode_write(&trans, &inode_iter, &inode_u) ?:
                bch2_trans_commit(&trans, NULL,
-                                 &inode->ei_journal_seq,
-                                 BTREE_INSERT_NOUNLOCK);
+                                 &inode->ei_journal_seq, 0);
 btree_err:
-       bch2_trans_iter_put(&trans, inode_iter);
+       bch2_trans_iter_exit(&trans, &inode_iter);
 
        if (ret == -EINTR)
                goto retry;
@@ -346,27 +349,31 @@ err:
        return ret;
 }
 
-int bch2_acl_chmod(struct btree_trans *trans,
+int bch2_acl_chmod(struct btree_trans *trans, subvol_inum inum,
                   struct bch_inode_unpacked *inode,
                   umode_t mode,
                   struct posix_acl **new_acl)
 {
        struct bch_hash_info hash_info = bch2_hash_info_init(trans->c, inode);
-       struct btree_iter *iter;
+       struct btree_iter iter;
        struct bkey_s_c_xattr xattr;
        struct bkey_i_xattr *new;
        struct posix_acl *acl;
+       struct bkey_s_c k;
        int ret;
 
-       iter = bch2_hash_lookup(trans, bch2_xattr_hash_desc,
-                       &hash_info, inode->bi_inum,
+       ret = bch2_hash_lookup(trans, &iter, bch2_xattr_hash_desc,
+                              &hash_info, inum,
                        &X_SEARCH(KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS, "", 0),
                        BTREE_ITER_INTENT);
-       ret = PTR_ERR_OR_ZERO(iter);
        if (ret)
                return ret == -ENOENT ? 0 : ret;
 
-       xattr = bkey_s_c_to_xattr(bch2_btree_iter_peek_slot(iter));
+       k = bch2_btree_iter_peek_slot(&iter);
+       xattr = bkey_s_c_to_xattr(k);
+       if (ret)
+               goto err;
+
        acl = bch2_acl_from_disk(xattr_val(xattr.v),
                        le16_to_cpu(xattr.v->x_val_len));
        ret = PTR_ERR_OR_ZERO(acl);
@@ -383,12 +390,12 @@ int bch2_acl_chmod(struct btree_trans *trans,
                goto err;
        }
 
-       new->k.p = iter->pos;
-       ret = bch2_trans_update(trans, iter, &new->k_i, 0);
+       new->k.p = iter.pos;
+       ret = bch2_trans_update(trans, &iter, &new->k_i, 0);
        *new_acl = acl;
        acl = NULL;
 err:
-       bch2_trans_iter_put(trans, iter);
+       bch2_trans_iter_exit(trans, &iter);
        if (!IS_ERR_OR_NULL(acl))
                kfree(acl);
        return ret;