]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/xattr.c
Update bcachefs sources to 400f275d46 bcachefs: Fix check_overlapping_extents()
[bcachefs-tools-debian] / libbcachefs / xattr.c
index ed62668bb155cc9c064182668409bead1f049f0b..4fc6e065d4212c31962d502dd41e95a0b603e631 100644 (file)
@@ -1,8 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include "bcachefs.h"
 #include "bkey_methods.h"
 #include "btree_update.h"
-#include "compress.h"
 #include "extents.h"
 #include "fs.h"
 #include "rebalance.h"
@@ -61,107 +61,98 @@ static bool xattr_cmp_bkey(struct bkey_s_c _l, struct bkey_s_c _r)
 }
 
 const struct bch_hash_desc bch2_xattr_hash_desc = {
-       .btree_id       = BTREE_ID_XATTRS,
-       .key_type       = BCH_XATTR,
-       .whiteout_type  = BCH_XATTR_WHITEOUT,
+       .btree_id       = BTREE_ID_xattrs,
+       .key_type       = KEY_TYPE_xattr,
        .hash_key       = xattr_hash_key,
        .hash_bkey      = xattr_hash_bkey,
        .cmp_key        = xattr_cmp_key,
        .cmp_bkey       = xattr_cmp_bkey,
 };
 
-const char *bch2_xattr_invalid(const struct bch_fs *c, struct bkey_s_c k)
+int bch2_xattr_invalid(const struct bch_fs *c, struct bkey_s_c k,
+                      unsigned flags, struct printbuf *err)
 {
        const struct xattr_handler *handler;
-       struct bkey_s_c_xattr xattr;
-
-       switch (k.k->type) {
-       case BCH_XATTR:
-               if (bkey_val_bytes(k.k) < sizeof(struct bch_xattr))
-                       return "value too small";
-
-               xattr = bkey_s_c_to_xattr(k);
-
-               if (bkey_val_u64s(k.k) <
-                       xattr_val_u64s(xattr.v->x_name_len,
-                                      le16_to_cpu(xattr.v->x_val_len)))
-                       return "value too small";
-
-               if (bkey_val_u64s(k.k) >
-                       xattr_val_u64s(xattr.v->x_name_len,
-                                      le16_to_cpu(xattr.v->x_val_len) + 4))
-                       return "value too big";
-
-               handler = bch2_xattr_type_to_handler(xattr.v->x_type);
-               if (!handler)
-                       return "invalid type";
+       struct bkey_s_c_xattr xattr = bkey_s_c_to_xattr(k);
+
+       if (bkey_val_u64s(k.k) <
+           xattr_val_u64s(xattr.v->x_name_len,
+                          le16_to_cpu(xattr.v->x_val_len))) {
+               prt_printf(err, "value too small (%zu < %u)",
+                      bkey_val_u64s(k.k),
+                      xattr_val_u64s(xattr.v->x_name_len,
+                                     le16_to_cpu(xattr.v->x_val_len)));
+               return -BCH_ERR_invalid_bkey;
+       }
 
-               if (memchr(xattr.v->x_name, '\0', xattr.v->x_name_len))
-                       return "xattr name has invalid characters";
+       /* XXX why +4 ? */
+       if (bkey_val_u64s(k.k) >
+           xattr_val_u64s(xattr.v->x_name_len,
+                          le16_to_cpu(xattr.v->x_val_len) + 4)) {
+               prt_printf(err, "value too big (%zu > %u)",
+                      bkey_val_u64s(k.k),
+                      xattr_val_u64s(xattr.v->x_name_len,
+                                     le16_to_cpu(xattr.v->x_val_len) + 4));
+               return -BCH_ERR_invalid_bkey;
+       }
 
-               return NULL;
-       case BCH_XATTR_WHITEOUT:
-               return bkey_val_bytes(k.k) != 0
-                       ? "value size should be zero"
-                       : NULL;
+       handler = bch2_xattr_type_to_handler(xattr.v->x_type);
+       if (!handler) {
+               prt_printf(err, "invalid type (%u)", xattr.v->x_type);
+               return -BCH_ERR_invalid_bkey;
+       }
 
-       default:
-               return "invalid type";
+       if (memchr(xattr.v->x_name, '\0', xattr.v->x_name_len)) {
+               prt_printf(err, "xattr name has invalid characters");
+               return -BCH_ERR_invalid_bkey;
        }
+
+       return 0;
 }
 
 void bch2_xattr_to_text(struct printbuf *out, struct bch_fs *c,
                        struct bkey_s_c k)
 {
        const struct xattr_handler *handler;
-       struct bkey_s_c_xattr xattr;
+       struct bkey_s_c_xattr xattr = bkey_s_c_to_xattr(k);
 
-       switch (k.k->type) {
-       case BCH_XATTR:
-               xattr = bkey_s_c_to_xattr(k);
+       handler = bch2_xattr_type_to_handler(xattr.v->x_type);
+       if (handler && handler->prefix)
+               prt_printf(out, "%s", handler->prefix);
+       else if (handler)
+               prt_printf(out, "(type %u)", xattr.v->x_type);
+       else
+               prt_printf(out, "(unknown type %u)", xattr.v->x_type);
 
-               handler = bch2_xattr_type_to_handler(xattr.v->x_type);
-               if (handler && handler->prefix)
-                       pr_buf(out, "%s", handler->prefix);
-               else if (handler)
-                       pr_buf(out, "(type %u)", xattr.v->x_type);
-               else
-                       pr_buf(out, "(unknown type %u)", xattr.v->x_type);
-
-               bch_scnmemcpy(out, xattr.v->x_name,
-                             xattr.v->x_name_len);
-               pr_buf(out, ":");
-               bch_scnmemcpy(out, xattr_val(xattr.v),
-                             le16_to_cpu(xattr.v->x_val_len));
-               break;
-       case BCH_XATTR_WHITEOUT:
-               pr_buf(out, "whiteout");
-               break;
-       }
+       prt_printf(out, "%.*s:%.*s",
+              xattr.v->x_name_len,
+              xattr.v->x_name,
+              le16_to_cpu(xattr.v->x_val_len),
+              (char *) xattr_val(xattr.v));
 }
 
-int bch2_xattr_get(struct bch_fs *c, struct bch_inode_info *inode,
-                  const char *name, void *buffer, size_t size, int type)
+static int bch2_xattr_get_trans(struct btree_trans *trans, struct bch_inode_info *inode,
+                               const char *name, void *buffer, size_t size, int type)
 {
-       struct btree_trans trans;
-       struct btree_iter *iter;
+       struct bch_hash_info hash = bch2_hash_info_init(trans->c, &inode->ei_inode);
+       struct btree_iter iter;
        struct bkey_s_c_xattr xattr;
+       struct bkey_s_c k;
        int ret;
 
-       bch2_trans_init(&trans, c);
-
-       iter = bch2_hash_lookup(&trans, bch2_xattr_hash_desc,
-                               &inode->ei_str_hash, inode->v.i_ino,
-                               &X_SEARCH(type, name, strlen(name)),
-                               0);
-       if (IS_ERR(iter)) {
-               bch2_trans_exit(&trans);
-               BUG_ON(PTR_ERR(iter) == -EINTR);
+       ret = bch2_hash_lookup(trans, &iter, bch2_xattr_hash_desc, &hash,
+                              inode_inum(inode),
+                              &X_SEARCH(type, name, strlen(name)),
+                              0);
+       if (ret)
+               goto err1;
 
-               return PTR_ERR(iter) == -ENOENT ? -ENODATA : PTR_ERR(iter);
-       }
+       k = bch2_btree_iter_peek_slot(&iter);
+       ret = bkey_err(k);
+       if (ret)
+               goto err2;
 
-       xattr = bkey_s_c_to_xattr(bch2_btree_iter_peek_slot(iter));
+       xattr = bkey_s_c_to_xattr(k);
        ret = le16_to_cpu(xattr.v->x_val_len);
        if (buffer) {
                if (ret > size)
@@ -169,18 +160,42 @@ int bch2_xattr_get(struct bch_fs *c, struct bch_inode_info *inode,
                else
                        memcpy(buffer, xattr_val(xattr.v), ret);
        }
+err2:
+       bch2_trans_iter_exit(trans, &iter);
+err1:
+       return ret == -ENOENT ? -ENODATA : ret;
+}
 
-       bch2_trans_exit(&trans);
-       return 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, u64 inum,
+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,
                   int type, int flags)
 {
+       struct btree_iter inode_iter = { NULL };
+       struct bch_inode_unpacked inode_u;
        int ret;
 
+       /*
+        * We need to do an inode update so that bi_journal_sync gets updated
+        * and fsync works:
+        *
+        * Perhaps we should be updating bi_mtime too?
+        */
+
+       ret   = bch2_inode_peek(trans, &inode_iter, &inode_u, inum, BTREE_ITER_INTENT) ?:
+               bch2_inode_write(trans, &inode_iter, &inode_u);
+       bch2_trans_iter_exit(trans, &inode_iter);
+
+       if (ret)
+               return ret;
+
        if (value) {
                struct bkey_i_xattr *xattr;
                unsigned namelen = strlen(name);
@@ -202,7 +217,7 @@ int bch2_xattr_set(struct btree_trans *trans, u64 inum,
                memcpy(xattr->v.x_name, name, namelen);
                memcpy(xattr_val(&xattr->v), value, size);
 
-               ret = __bch2_hash_set(trans, bch2_xattr_hash_desc, hash_info,
+               ret = bch2_hash_set(trans, bch2_xattr_hash_desc, hash_info,
                              inum, &xattr->k_i,
                              (flags & XATTR_CREATE ? BCH_HASH_SET_MUST_CREATE : 0)|
                              (flags & XATTR_REPLACE ? BCH_HASH_SET_MUST_REPLACE : 0));
@@ -220,69 +235,128 @@ int bch2_xattr_set(struct btree_trans *trans, u64 inum,
        return ret;
 }
 
-static size_t bch2_xattr_emit(struct dentry *dentry,
-                            const struct bch_xattr *xattr,
-                            char *buffer, size_t buffer_size)
+struct xattr_buf {
+       char            *buf;
+       size_t          len;
+       size_t          used;
+};
+
+static int __bch2_xattr_emit(const char *prefix,
+                            const char *name, size_t name_len,
+                            struct xattr_buf *buf)
+{
+       const size_t prefix_len = strlen(prefix);
+       const size_t total_len = prefix_len + name_len + 1;
+
+       if (buf->buf) {
+               if (buf->used + total_len > buf->len)
+                       return -ERANGE;
+
+               memcpy(buf->buf + buf->used, prefix, prefix_len);
+               memcpy(buf->buf + buf->used + prefix_len,
+                      name, name_len);
+               buf->buf[buf->used + prefix_len + name_len] = '\0';
+       }
+
+       buf->used += total_len;
+       return 0;
+}
+
+static int bch2_xattr_emit(struct dentry *dentry,
+                           const struct bch_xattr *xattr,
+                           struct xattr_buf *buf)
 {
        const struct xattr_handler *handler =
                bch2_xattr_type_to_handler(xattr->x_type);
 
-       if (handler && (!handler->list || handler->list(dentry))) {
-               const char *prefix = handler->prefix ?: handler->name;
-               const size_t prefix_len = strlen(prefix);
-               const size_t total_len = prefix_len + xattr->x_name_len + 1;
+       return handler && (!handler->list || handler->list(dentry))
+               ? __bch2_xattr_emit(handler->prefix ?: handler->name,
+                                   xattr->x_name, xattr->x_name_len, buf)
+               : 0;
+}
 
-               if (buffer && total_len <= buffer_size) {
-                       memcpy(buffer, prefix, prefix_len);
-                       memcpy(buffer + prefix_len,
-                              xattr->x_name, xattr->x_name_len);
-                       buffer[prefix_len + xattr->x_name_len] = '\0';
-               }
+static int bch2_xattr_list_bcachefs(struct bch_fs *c,
+                                   struct bch_inode_unpacked *inode,
+                                   struct xattr_buf *buf,
+                                   bool all)
+{
+       const char *prefix = all ? "bcachefs_effective." : "bcachefs.";
+       unsigned id;
+       int ret = 0;
+       u64 v;
 
-               return total_len;
-       } else {
-               return 0;
+       for (id = 0; id < Inode_opt_nr; id++) {
+               v = bch2_inode_opt_get(inode, id);
+               if (!v)
+                       continue;
+
+               if (!all &&
+                   !(inode->bi_fields_set & (1 << id)))
+                       continue;
+
+               ret = __bch2_xattr_emit(prefix, bch2_inode_opts[id],
+                                       strlen(bch2_inode_opts[id]), buf);
+               if (ret)
+                       break;
        }
+
+       return ret;
 }
 
 ssize_t bch2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
 {
        struct bch_fs *c = dentry->d_sb->s_fs_info;
+       struct bch_inode_info *inode = to_bch_ei(dentry->d_inode);
+       struct btree_trans trans;
        struct btree_iter iter;
        struct bkey_s_c k;
-       const struct bch_xattr *xattr;
-       u64 inum = dentry->d_inode->i_ino;
-       ssize_t ret = 0;
-       size_t len;
+       struct xattr_buf buf = { .buf = buffer, .len = buffer_size };
+       u64 offset = 0, inum = inode->ei_inode.bi_inum;
+       u32 snapshot;
+       int ret;
 
-       for_each_btree_key(&iter, c, BTREE_ID_XATTRS, POS(inum, 0), 0, k) {
-               BUG_ON(k.k->p.inode < inum);
+       bch2_trans_init(&trans, c, 0, 0);
+retry:
+       bch2_trans_begin(&trans);
+       iter = (struct btree_iter) { NULL };
 
-               if (k.k->p.inode > inum)
-                       break;
+       ret = bch2_subvolume_get_snapshot(&trans, inode->ei_subvol, &snapshot);
+       if (ret)
+               goto err;
 
-               if (k.k->type != BCH_XATTR)
+       for_each_btree_key_upto_norestart(&trans, iter, BTREE_ID_xattrs,
+                          SPOS(inum, offset, snapshot),
+                          POS(inum, U64_MAX), 0, k, ret) {
+               if (k.k->type != KEY_TYPE_xattr)
                        continue;
 
-               xattr = bkey_s_c_to_xattr(k).v;
+               ret = bch2_xattr_emit(dentry, bkey_s_c_to_xattr(k).v, &buf);
+               if (ret)
+                       break;
+       }
 
-               len = bch2_xattr_emit(dentry, xattr, buffer, buffer_size);
-               if (buffer) {
-                       if (len > buffer_size) {
-                               bch2_btree_iter_unlock(&iter);
-                               return -ERANGE;
-                       }
+       offset = iter.pos.offset;
+       bch2_trans_iter_exit(&trans, &iter);
+err:
+       if (bch2_err_matches(ret, BCH_ERR_transaction_restart))
+               goto retry;
 
-                       buffer += len;
-                       buffer_size -= len;
-               }
+       bch2_trans_exit(&trans);
 
-               ret += len;
+       if (ret)
+               goto out;
 
-       }
-       bch2_btree_iter_unlock(&iter);
+       ret = bch2_xattr_list_bcachefs(c, &inode->ei_inode, &buf, false);
+       if (ret)
+               goto out;
 
-       return ret;
+       ret = bch2_xattr_list_bcachefs(c, &inode->ei_inode, &buf, true);
+       if (ret)
+               goto out;
+
+       return buf.used;
+out:
+       return bch2_err_class(ret);
 }
 
 static int bch2_xattr_get_handler(const struct xattr_handler *handler,
@@ -291,30 +365,35 @@ 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;
 
-       return bch2_xattr_get(c, inode, name, buffer, size, handler->flags);
+       ret = bch2_xattr_get(c, inode, name, buffer, size, handler->flags);
+       return bch2_err_class(ret);
 }
 
 static int bch2_xattr_set_handler(const struct xattr_handler *handler,
+                                 struct mnt_idmap *idmap,
                                  struct dentry *dentry, struct inode *vinode,
                                  const char *name, const void *value,
                                  size_t size, int flags)
 {
        struct bch_inode_info *inode = to_bch_ei(vinode);
        struct bch_fs *c = inode->v.i_sb->s_fs_info;
+       struct bch_hash_info hash = bch2_hash_info_init(c, &inode->ei_inode);
+       int ret;
 
-       return bch2_trans_do(c, &inode->ei_journal_seq, BTREE_INSERT_ATOMIC,
-                       bch2_xattr_set(&trans, inode->v.i_ino,
-                                      &inode->ei_str_hash,
+       ret = bch2_trans_do(c, NULL, NULL, 0,
+                       bch2_xattr_set(&trans, inode_inum(inode), &hash,
                                       name, value, size,
                                       handler->flags, flags));
+       return bch2_err_class(ret);
 }
 
 static const struct xattr_handler bch_xattr_user_handler = {
        .prefix = XATTR_USER_PREFIX,
        .get    = bch2_xattr_get_handler,
        .set    = bch2_xattr_set_handler,
-       .flags  = BCH_XATTR_INDEX_USER,
+       .flags  = KEY_TYPE_XATTR_INDEX_USER,
 };
 
 static bool bch2_xattr_trusted_list(struct dentry *dentry)
@@ -327,57 +406,86 @@ static const struct xattr_handler bch_xattr_trusted_handler = {
        .list   = bch2_xattr_trusted_list,
        .get    = bch2_xattr_get_handler,
        .set    = bch2_xattr_set_handler,
-       .flags  = BCH_XATTR_INDEX_TRUSTED,
+       .flags  = KEY_TYPE_XATTR_INDEX_TRUSTED,
 };
 
 static const struct xattr_handler bch_xattr_security_handler = {
        .prefix = XATTR_SECURITY_PREFIX,
        .get    = bch2_xattr_get_handler,
        .set    = bch2_xattr_set_handler,
-       .flags  = BCH_XATTR_INDEX_SECURITY,
+       .flags  = KEY_TYPE_XATTR_INDEX_SECURITY,
 };
 
 #ifndef NO_BCACHEFS_FS
 
-static int bch2_xattr_bcachefs_get(const struct xattr_handler *handler,
-                                  struct dentry *dentry, struct inode *vinode,
-                                  const char *name, void *buffer, size_t size)
+static int opt_to_inode_opt(int id)
+{
+       switch (id) {
+#define x(name, ...)                           \
+       case Opt_##name: return Inode_opt_##name;
+       BCH_INODE_OPTS()
+#undef  x
+       default:
+               return -1;
+       }
+}
+
+static int __bch2_xattr_bcachefs_get(const struct xattr_handler *handler,
+                               struct dentry *dentry, struct inode *vinode,
+                               const char *name, void *buffer, size_t size,
+                               bool all)
 {
        struct bch_inode_info *inode = to_bch_ei(vinode);
        struct bch_fs *c = inode->v.i_sb->s_fs_info;
        struct bch_opts opts =
-               bch2_inode_opts_to_opts(bch2_inode_opts_get(&inode->ei_inode));
+               bch2_inode_opts_to_opts(&inode->ei_inode);
        const struct bch_option *opt;
-       int id;
+       int id, inode_opt_id;
+       struct printbuf out = PRINTBUF;
+       int ret;
        u64 v;
 
        id = bch2_opt_lookup(name);
        if (id < 0 || !bch2_opt_is_inode_opt(id))
                return -EINVAL;
 
+       inode_opt_id = opt_to_inode_opt(id);
+       if (inode_opt_id < 0)
+               return -EINVAL;
+
        opt = bch2_opt_table + id;
 
        if (!bch2_opt_defined_by_id(&opts, id))
                return -ENODATA;
 
-       v = bch2_opt_get_by_id(&opts, id);
+       if (!all &&
+           !(inode->ei_inode.bi_fields_set & (1 << inode_opt_id)))
+               return -ENODATA;
 
-       if (!buffer) {
-               char buf[512];
-               struct printbuf out = PBUF(buf);
+       v = bch2_opt_get_by_id(&opts, id);
+       bch2_opt_to_text(&out, c, c->disk_sb.sb, opt, v, 0);
 
-               bch2_opt_to_text(&out, c, opt, v, 0);
+       ret = out.pos;
 
-               return out.pos - buf;
-       } else {
-               struct printbuf out = _PBUF(buffer, size);
+       if (out.allocation_failure) {
+               ret = -ENOMEM;
+       } else if (buffer) {
+               if (out.pos > size)
+                       ret = -ERANGE;
+               else
+                       memcpy(buffer, out.buf, out.pos);
+       }
 
-               bch2_opt_to_text(&out, c, opt, v, 0);
+       printbuf_exit(&out);
+       return ret;
+}
 
-               return printbuf_remaining(&out)
-                       ? (void *) out.pos - buffer
-                       : -ERANGE;
-       }
+static int bch2_xattr_bcachefs_get(const struct xattr_handler *handler,
+                                  struct dentry *dentry, struct inode *vinode,
+                                  const char *name, void *buffer, size_t size)
+{
+       return __bch2_xattr_bcachefs_get(handler, dentry, vinode,
+                                        name, buffer, size, false);
 }
 
 struct inode_opt_set {
@@ -393,13 +501,17 @@ static int inode_opt_set_fn(struct bch_inode_info *inode,
        struct inode_opt_set *s = p;
 
        if (s->defined)
-               bch2_inode_opt_set(bi, s->id, s->v);
+               bi->bi_fields_set |= 1U << s->id;
        else
-               bch2_inode_opt_clear(bi, s->id);
+               bi->bi_fields_set &= ~(1U << s->id);
+
+       bch2_inode_opt_set(bi, s->id, s->v);
+
        return 0;
 }
 
 static int bch2_xattr_bcachefs_set(const struct xattr_handler *handler,
+                                  struct mnt_idmap *idmap,
                                   struct dentry *dentry, struct inode *vinode,
                                   const char *name, const void *value,
                                   size_t size, int flags)
@@ -409,46 +521,72 @@ static int bch2_xattr_bcachefs_set(const struct xattr_handler *handler,
        const struct bch_option *opt;
        char *buf;
        struct inode_opt_set s;
-       int ret;
+       int opt_id, inode_opt_id, ret;
 
-       s.id = bch2_opt_lookup(name);
-       if (s.id < 0 || !bch2_opt_is_inode_opt(s.id))
+       opt_id = bch2_opt_lookup(name);
+       if (opt_id < 0)
                return -EINVAL;
 
-       opt = bch2_opt_table + s.id;
+       opt = bch2_opt_table + opt_id;
+
+       inode_opt_id = opt_to_inode_opt(opt_id);
+       if (inode_opt_id < 0)
+               return -EINVAL;
+
+       s.id = inode_opt_id;
 
        if (value) {
+               u64 v = 0;
+
                buf = kmalloc(size + 1, GFP_KERNEL);
                if (!buf)
                        return -ENOMEM;
                memcpy(buf, value, size);
                buf[size] = '\0';
 
-               ret = bch2_opt_parse(c, opt, buf, &s.v);
+               ret = bch2_opt_parse(c, opt, buf, &v, NULL);
                kfree(buf);
 
                if (ret < 0)
                        return ret;
 
-               if (s.id == Opt_compression ||
-                   s.id == Opt_background_compression) {
-                       ret = bch2_check_set_has_compressed_data(c, s.v);
-                       if (ret)
-                               return ret;
-               }
+               ret = bch2_opt_check_may_set(c, opt_id, v);
+               if (ret < 0)
+                       return ret;
 
+               s.v = v + 1;
                s.defined = true;
        } else {
+               if (!IS_ROOT(dentry)) {
+                       struct bch_inode_info *dir =
+                               to_bch_ei(d_inode(dentry->d_parent));
+
+                       s.v = bch2_inode_opt_get(&dir->ei_inode, inode_opt_id);
+               } else {
+                       s.v = 0;
+               }
+
                s.defined = false;
        }
 
        mutex_lock(&inode->ei_update_lock);
+       if (inode_opt_id == Inode_opt_project) {
+               /*
+                * inode fields accessible via the xattr interface are stored
+                * with a +1 bias, so that 0 means unset:
+                */
+               ret = bch2_set_projid(c, inode, s.v ? s.v - 1 : 0);
+               if (ret)
+                       goto err;
+       }
+
        ret = bch2_write_inode(c, inode, inode_opt_set_fn, &s, 0);
+err:
        mutex_unlock(&inode->ei_update_lock);
 
        if (value &&
-           (s.id == Opt_background_compression ||
-            s.id == Opt_background_target))
+           (opt_id == Opt_background_compression ||
+            opt_id == Opt_background_target))
                bch2_rebalance_add_work(c, inode->v.i_blocks);
 
        return ret;
@@ -460,28 +598,46 @@ static const struct xattr_handler bch_xattr_bcachefs_handler = {
        .set    = bch2_xattr_bcachefs_set,
 };
 
+static int bch2_xattr_bcachefs_get_effective(
+                               const struct xattr_handler *handler,
+                               struct dentry *dentry, struct inode *vinode,
+                               const char *name, void *buffer, size_t size)
+{
+       return __bch2_xattr_bcachefs_get(handler, dentry, vinode,
+                                        name, buffer, size, true);
+}
+
+static const struct xattr_handler bch_xattr_bcachefs_effective_handler = {
+       .prefix = "bcachefs_effective.",
+       .get    = bch2_xattr_bcachefs_get_effective,
+       .set    = bch2_xattr_bcachefs_set,
+};
+
 #endif /* NO_BCACHEFS_FS */
 
 const struct xattr_handler *bch2_xattr_handlers[] = {
        &bch_xattr_user_handler,
+#ifdef CONFIG_BCACHEFS_POSIX_ACL
        &posix_acl_access_xattr_handler,
        &posix_acl_default_xattr_handler,
+#endif
        &bch_xattr_trusted_handler,
        &bch_xattr_security_handler,
 #ifndef NO_BCACHEFS_FS
        &bch_xattr_bcachefs_handler,
+       &bch_xattr_bcachefs_effective_handler,
 #endif
        NULL
 };
 
 static const struct xattr_handler *bch_xattr_handler_map[] = {
-       [BCH_XATTR_INDEX_USER]                  = &bch_xattr_user_handler,
-       [BCH_XATTR_INDEX_POSIX_ACL_ACCESS]      =
+       [KEY_TYPE_XATTR_INDEX_USER]                     = &bch_xattr_user_handler,
+       [KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS] =
                &posix_acl_access_xattr_handler,
-       [BCH_XATTR_INDEX_POSIX_ACL_DEFAULT]     =
+       [KEY_TYPE_XATTR_INDEX_POSIX_ACL_DEFAULT]        =
                &posix_acl_default_xattr_handler,
-       [BCH_XATTR_INDEX_TRUSTED]               = &bch_xattr_trusted_handler,
-       [BCH_XATTR_INDEX_SECURITY]              = &bch_xattr_security_handler,
+       [KEY_TYPE_XATTR_INDEX_TRUSTED]          = &bch_xattr_trusted_handler,
+       [KEY_TYPE_XATTR_INDEX_SECURITY]         = &bch_xattr_security_handler,
 };
 
 static const struct xattr_handler *bch2_xattr_type_to_handler(unsigned type)