Branch b1_6

Reset error code if we are retrying to insert the qdata into the hashtable
to avoid later assertion.
b=14785
i=johann
i=andrew.perepechko

diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index e5e12f6..74fd0f0 100644 (file)
--- a/lustre/quota/quota_context.c
+++ b/lustre/quota/quota_context.c
@@ -201,8 +201,10 @@ check_cur_qunit(struct obd_device *obd,
         if (!lqs) {
                 CDEBUG(D_QUOTA, "Can't find the lustre qunit size!\n");
                 ret = quota_create_lqs(qdata, NULL, qctxt, &lqs);
-                if (ret == -EALREADY)
+                if (ret == -EALREADY) {
+                        ret = 0;
                         goto search_lqs;
+                }
                 if (ret < 0)
                         GOTO (out, ret);
         }