Update bcachefs sources to 96b991466a bcachefs: Improve error message in fsck

[bcachefs-tools-debian] / libbcachefs / quota.h

diff --git a/libbcachefs/quota.h b/libbcachefs/quota.h
index 09d51a839c9d056b88022a5ef2bd9cd98b3bfa91..51e4f9713ef0bd7904b7aea90ee72dcafcaf5ad9 100644 (file)
--- a/libbcachefs/quota.h
+++ b/libbcachefs/quota.h
@@ -1,32 +1,43 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_QUOTA_H
 #define _BCACHEFS_QUOTA_H
 
+#include "inode.h"
 #include "quota_types.h"
 
-extern const struct bkey_ops bch2_bkey_quota_ops;
+extern const struct bch_sb_field_ops bch_sb_field_ops_quota;
 
-enum quota_acct_mode {
-       BCH_QUOTA_PREALLOC,
-       BCH_QUOTA_WARN,
-       BCH_QUOTA_NOCHECK,
-};
+const char *bch2_quota_invalid(const struct bch_fs *, struct bkey_s_c);
+void bch2_quota_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
+
+#define bch2_bkey_ops_quota (struct bkey_ops) {                \
+       .key_invalid    = bch2_quota_invalid,           \
+       .val_to_text    = bch2_quota_to_text,           \
+}
 
 static inline struct bch_qid bch_qid(struct bch_inode_unpacked *u)
 {
        return (struct bch_qid) {
                .q[QTYP_USR] = u->bi_uid,
                .q[QTYP_GRP] = u->bi_gid,
-               .q[QTYP_PRJ] = u->bi_project,
+               .q[QTYP_PRJ] = u->bi_project ? u->bi_project - 1 : 0,
        };
 }
 
+static inline unsigned enabled_qtypes(struct bch_fs *c)
+{
+       return ((c->opts.usrquota << QTYP_USR)|
+               (c->opts.grpquota << QTYP_GRP)|
+               (c->opts.prjquota << QTYP_PRJ));
+}
+
 #ifdef CONFIG_BCACHEFS_QUOTA
 
 int bch2_quota_acct(struct bch_fs *, struct bch_qid, enum quota_counters,
                    s64, enum quota_acct_mode);
 
 int bch2_quota_transfer(struct bch_fs *, unsigned, struct bch_qid,
-                       struct bch_qid, u64);
+                       struct bch_qid, u64, enum quota_acct_mode);
 
 void bch2_fs_quota_exit(struct bch_fs *);
 void bch2_fs_quota_init(struct bch_fs *);
@@ -36,8 +47,20 @@ extern const struct quotactl_ops bch2_quotactl_operations;
 
 #else
 
-#define bch2_quota_acct(_c, _uid, _gid, _counter, _v) (0)
-#define bch2_quota_transfer(_c, _type, _src, _dst, _v) (0)
+static inline int bch2_quota_acct(struct bch_fs *c, struct bch_qid qid,
+                                 enum quota_counters counter, s64 v,
+                                 enum quota_acct_mode mode)
+{
+       return 0;
+}
+
+static inline int bch2_quota_transfer(struct bch_fs *c, unsigned qtypes,
+                                     struct bch_qid dst,
+                                     struct bch_qid src, u64 space,
+                                     enum quota_acct_mode mode)
+{
+       return 0;
+}
 
 static inline void bch2_fs_quota_exit(struct bch_fs *c) {}
 static inline void bch2_fs_quota_init(struct bch_fs *c) {}