From 56203820a260e9ddb6e084df842e6697c7a4eca7 Mon Sep 17 00:00:00 2001 From: Niu Yawei Date: Tue, 29 Nov 2016 22:43:56 -0500 Subject: [PATCH] LU-8872 quota: incorrect LASSERT Remove an incorrect LASSERT in qsd_add_deferred(). Signed-off-by: Niu Yawei Change-Id: I7ea0274032ac67e3a039a0a0982d5945498fd434 Reviewed-on: https://review.whamcloud.com/24024 Reviewed-by: Lai Siyao Reviewed-by: Fan Yong Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/quota/qsd_writeback.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lustre/quota/qsd_writeback.c b/lustre/quota/qsd_writeback.c index 8352e59..9b12c2c 100644 --- a/lustre/quota/qsd_writeback.c +++ b/lustre/quota/qsd_writeback.c @@ -121,9 +121,14 @@ static void qsd_add_deferred(struct qsd_instance *qsd, struct list_head *list, * updates. We should just delete the legacy record in such * case. */ if (upd->qur_ver == tmp->qur_ver) { - LASSERT(tmp->qur_lqe); - LQUOTA_ERROR(tmp->qur_lqe, "Found a conflict record " - "with ver:%llu", tmp->qur_ver); + if (tmp->qur_lqe) + LQUOTA_WARN(tmp->qur_lqe, "Found a conflict " + "record with ver:%llu", + tmp->qur_ver); + else + CWARN("%s: Found a conflict record with ver: " + "%llu\n", qsd->qsd_svname, tmp->qur_ver); + list_del_init(&tmp->qur_link); qsd_upd_free(tmp); } else if (upd->qur_ver < tmp->qur_ver) { -- 1.8.3.1