X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_quota.c;h=a4fef99b5f2c133cd5ad6f82ec5d7536d04c3280;hb=16184a05de0db78bf4a8056525db09fc96c31256;hp=9e16533766c0528c48adf210887958ec4328916e;hpb=5c584d02f247a992fd45779846355c061e0a1835;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_quota.c b/lustre/osd-ldiskfs/osd_quota.c
index 9e16533..a4fef99b 100644
--- a/lustre/osd-ldiskfs/osd_quota.c
+++ b/lustre/osd-ldiskfs/osd_quota.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann@whamcloud.com>
@@ -846,6 +846,8 @@ out:
 	return rc;
 }
 
+/* Nobdy else can access the global index now, it's safe to truncate and
+ * reinitialize it */
 static int truncate_quota_index(const struct lu_env *env, struct dt_object *dt,
 				const struct dt_index_features *feat)
 {
@@ -855,8 +857,14 @@ static int truncate_quota_index(const struct lu_env *env, struct dt_object *dt,
 	struct osd_thandle	*oth;
 	struct inode		*inode;
 	int			 rc;
+	struct iam_container	*bag = &(osd_dt_obj(dt))->oo_dir->od_container;
 	ENTRY;
 
+	LASSERT(bag->ic_root_bh != NULL);
+	iam_container_fini(bag);
+
+	LASSERT(fid_seq(lu_object_fid(&dt->do_lu)) == FID_SEQ_QUOTA_GLB);
+
 	OBD_ALLOC_PTR(attr);
 	if (attr == NULL)
 		RETURN(-ENOMEM);
@@ -915,6 +923,12 @@ out_lock:
 out:
 	dt_trans_stop(env, &osd->od_dt_dev, th);
 	OBD_FREE_PTR(attr);
+
+	if (rc == 0) {
+		rc  = iam_container_setup(bag);
+		if (rc != 0)
+			iam_container_fini(bag);
+	}
 	RETURN(rc);
 }
 
@@ -954,7 +968,7 @@ int osd_quota_migration(const struct lu_env *env, struct dt_object *dt,
 	struct dt_object	*root, *parent = NULL, *admin = NULL;
 	dt_obj_version_t	 version;
 	char			*fname;
-	bool			 isblk, converted = false;
+	bool			 isblk = false, converted = false;
 	int			 rc;
 	ENTRY;
 
@@ -1039,7 +1053,7 @@ int osd_quota_migration(const struct lu_env *env, struct dt_object *dt,
 	if (rc) {
 		CERROR("%s: Failed to truncate the quota index "DFID", rc:%d\n",
 		       osd->od_svname, PFID(lu_object_fid(&dt->do_lu)), rc);
-		RETURN(rc);
+		GOTO(out, rc);
 	}
 
 	/* set up indexing operations for the admin file */