X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_object.c;h=042ea47e7539d4e6bf7dba97e40443cbedc2747d;hb=11afef00b6af407b8987076bd4f1ec9bc77eb75e;hp=2e64f18b01f68a7d02a74db8fd306dbf92d2615d;hpb=c0d30fc79be0788fca19bfa7e3b5048881195fc6;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c
index 2e64f18..042ea47 100644
--- a/lustre/osd-zfs/osd_object.c
+++ b/lustre/osd-zfs/osd_object.c
@@ -522,10 +522,6 @@ static int osd_declare_object_destroy(const struct lu_env *env,
 
 	osd_declare_xattrs_destroy(env, obj, oh);
 
-	/* declare that we'll remove object from inode accounting ZAPs */
-	dmu_tx_hold_zap(oh->ot_tx, osd->od_iusr_oid, FALSE, NULL);
-	dmu_tx_hold_zap(oh->ot_tx, osd->od_igrp_oid, FALSE, NULL);
-
 	/* one less inode */
 	rc = osd_declare_quota(env, osd, obj->oo_attr.la_uid,
 			       obj->oo_attr.la_gid, -1, oh, false, NULL, false);
@@ -592,22 +588,6 @@ static int osd_object_destroy(const struct lu_env *env,
 		GOTO(out, rc);
 	}
 
-	/* Remove object from inode accounting. It is not fatal for the destroy
-	 * operation if something goes wrong while updating accounting, but we
-	 * still log an error message to notify the administrator */
-	rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
-				obj->oo_attr.la_uid, -1, oh->ot_tx);
-	if (rc)
-		CERROR("%s: failed to remove "DFID" from accounting ZAP for usr"
-		       " %d: rc = %d\n", osd->od_svname, PFID(fid),
-		       obj->oo_attr.la_uid, rc);
-	rc = -zap_increment_int(osd->od_os, osd->od_igrp_oid,
-				obj->oo_attr.la_gid, -1, oh->ot_tx);
-	if (rc)
-		CERROR("%s: failed to remove "DFID" from accounting ZAP for grp"
-		       " %d: rc = %d\n", osd->od_svname, PFID(fid),
-		       obj->oo_attr.la_gid, rc);
-
 	oid = obj->oo_dn->dn_object;
 	if (unlikely(obj->oo_destroy == OSD_DESTROY_NONE)) {
 		/* this may happen if the destroy wasn't declared
@@ -898,9 +878,6 @@ static int osd_declare_attr_set(const struct lu_env *env,
 	}
 
 	if (attr && attr->la_valid & LA_UID) {
-		/* account for user inode tracking ZAP update */
-		dmu_tx_hold_zap(oh->ot_tx, osd->od_iusr_oid, FALSE, NULL);
-
 		/* quota enforcement for user */
 		if (attr->la_uid != obj->oo_attr.la_uid) {
 			rc = qsd_transfer(env, osd->od_quota_slave,
@@ -912,9 +889,6 @@ static int osd_declare_attr_set(const struct lu_env *env,
 		}
 	}
 	if (attr && attr->la_valid & LA_GID) {
-		/* account for user inode tracking ZAP update */
-		dmu_tx_hold_zap(oh->ot_tx, osd->od_igrp_oid, FALSE, NULL);
-
 		/* quota enforcement for group */
 		if (attr->la_gid != obj->oo_attr.la_gid) {
 			rc = qsd_transfer(env, osd->od_quota_slave,
@@ -1015,38 +989,6 @@ static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
 		}
 	}
 
-	/* do both accounting updates outside oo_attr_lock below */
-	if ((valid & LA_UID) && (la->la_uid != obj->oo_attr.la_uid)) {
-		/* Update user accounting. Failure isn't fatal, but we still
-		 * log an error message */
-		rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
-					la->la_uid, 1, oh->ot_tx);
-		if (rc)
-			CERROR("%s: failed to update accounting ZAP for user "
-				"%d (%d)\n", osd->od_svname, la->la_uid, rc);
-		rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
-					obj->oo_attr.la_uid, -1, oh->ot_tx);
-		if (rc)
-			CERROR("%s: failed to update accounting ZAP for user "
-				"%d (%d)\n", osd->od_svname,
-				obj->oo_attr.la_uid, rc);
-	}
-	if ((valid & LA_GID) && (la->la_gid != obj->oo_attr.la_gid)) {
-		/* Update group accounting. Failure isn't fatal, but we still
-		 * log an error message */
-		rc = -zap_increment_int(osd->od_os, osd->od_igrp_oid,
-					la->la_gid, 1, oh->ot_tx);
-		if (rc)
-			CERROR("%s: failed to update accounting ZAP for user "
-				"%d (%d)\n", osd->od_svname, la->la_gid, rc);
-		rc = -zap_increment_int(osd->od_os, osd->od_igrp_oid,
-					obj->oo_attr.la_gid, -1, oh->ot_tx);
-		if (rc)
-			CERROR("%s: failed to update accounting ZAP for user "
-				"%d (%d)\n", osd->od_svname,
-				obj->oo_attr.la_gid, rc);
-	}
-
 	write_lock(&obj->oo_attr_lock);
 	cnt = 0;
 	if (valid & LA_ATIME) {
@@ -1202,10 +1144,6 @@ static int osd_declare_object_create(const struct lu_env *env,
 	zapid = osd_get_name_n_idx(env, osd, fid, NULL, 0);
 	dmu_tx_hold_zap(oh->ot_tx, zapid, TRUE, NULL);
 
-	/* we will also update inode accounting ZAPs */
-	dmu_tx_hold_zap(oh->ot_tx, osd->od_iusr_oid, FALSE, NULL);
-	dmu_tx_hold_zap(oh->ot_tx, osd->od_igrp_oid, FALSE, NULL);
-
 	/* will help to find FID->ino mapping at dt_insert() */
 	osd_idc_find_and_init(env, osd, obj);
 
@@ -1537,10 +1475,6 @@ static int osd_object_create(const struct lu_env *env, struct dt_object *dt,
 	LASSERT(th != NULL);
 	oh = container_of0(th, struct osd_thandle, ot_super);
 
-	/*
-	 * XXX missing: Quote handling.
-	 */
-
 	LASSERT(obj->oo_dn == NULL);
 
 	/* to follow ZFS on-disk format we need
@@ -1608,21 +1542,6 @@ static int osd_object_create(const struct lu_env *env, struct dt_object *dt,
 		GOTO(out, rc);
 	osd_idc_find_and_init(env, osd, obj);
 
-	/* Add new object to inode accounting.
-	 * Errors are not considered as fatal */
-	rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
-				(attr->la_valid & LA_UID) ? attr->la_uid : 0, 1,
-				oh->ot_tx);
-	if (rc)
-		CERROR("%s: failed to add "DFID" to accounting ZAP for usr %d "
-			"(%d)\n", osd->od_svname, PFID(fid), attr->la_uid, rc);
-	rc = -zap_increment_int(osd->od_os, osd->od_igrp_oid,
-				(attr->la_valid & LA_GID) ? attr->la_gid : 0, 1,
-				oh->ot_tx);
-	if (rc)
-		CERROR("%s: failed to add "DFID" to accounting ZAP for grp %d "
-			"(%d)\n", osd->od_svname, PFID(fid), attr->la_gid, rc);
-
 out:
 	if (unlikely(rc && dn)) {
 		dmu_object_free(osd->od_os, dn->dn_object, oh->ot_tx);