X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_internal.h;h=c53ad8bdb57fb25461163163f7603437e2e0139b;hp=a621c32cbfc76bdc84aed11c71179aeedad39279;hb=f78ad4badd4f84c08c12d42b2723afe88ec75b83;hpb=f379c50c6ab8a3f08f838873f4c62e0abdcf6899

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index a621c32..c53ad8b 100644
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -82,8 +82,6 @@ struct osd_it_quota {
 	zap_cursor_t		*oiq_zc;
 	/** identifier for current quota record */
 	__u64			 oiq_id;
-	/* the hash where object accounting is cached */
-	cfs_hash_t		*oiq_hash;
 	unsigned		 oiq_reset:1; /* 1 -- no need to advance */
 };
 
@@ -229,16 +227,6 @@ struct osd_seq_list {
 #define OSD_OST_MAP_SIZE	32
 
 /*
- * this structure tracks changes made to the accounting within specific TXG
- */
-struct osd_zfs_acct_txg {
-	uint64_t		 zat_txg;
-	cfs_hash_t		*zat_usr;
-	cfs_hash_t		*zat_grp;
-	struct osd_device	*zat_osd;
-};
-
-/*
  * osd device.
  */
 struct osd_device {
@@ -292,13 +280,6 @@ struct osd_device {
 
 	arc_prune_t		*arc_prune_cb;
 
-	/* quota: object accounting */
-	spinlock_t		 od_known_txg_lock;
-	uint64_t		 od_known_txg;
-	struct osd_zfs_acct_txg *od_acct_delta;
-	cfs_hash_t		*od_acct_usr;
-	cfs_hash_t		*od_acct_grp;
-
 	/* osd seq instance */
 	struct lu_client_seq	*od_cl_seq;
 };
@@ -335,6 +316,7 @@ struct osd_object {
 
 int osd_statfs(const struct lu_env *, struct dt_device *, struct obd_statfs *);
 extern const struct dt_index_operations osd_acct_index_ops;
+uint64_t osd_quota_fid2dmu(const struct lu_fid *fid);
 extern struct lu_device_operations  osd_lu_ops;
 int osd_declare_quota(const struct lu_env *env, struct osd_device *osd,
 		      qid_t uid, qid_t gid, long long space,
@@ -517,13 +499,6 @@ osd_xattr_set_internal(const struct lu_env *env, struct osd_object *obj,
 	return rc;
 }
 
-void osd_zfs_acct_uid(const struct lu_env *env, struct osd_device *osd,
-		     __u64 uid, int delta, struct osd_thandle *oh);
-void osd_zfs_acct_gid(const struct lu_env *env, struct osd_device *osd,
-		     __u64 gid, int delta, struct osd_thandle *oh);
-int osd_zfs_acct_init(const struct lu_env *env, struct osd_device *osd);
-void osd_zfs_acct_fini(const struct lu_env *env, struct osd_device *osd);
-
 static inline uint64_t attrs_fs2zfs(const uint32_t flags)
 {
 	return (((flags & FS_APPEND_FL)		? ZFS_APPENDONLY	: 0) |