LU-15503 quota: fix list entry usage

Fetch next list entry.

Fixes: d527e81246 (LU-15283 quota: deadlock between reint & lquota_wb)
Signed-off-by: Yang Sheng <ys@whamcloud.com>
Change-Id: I86befdfaa96151a6fd61902ffbf43ee8e5cae8cb

diff --git a/lustre/quota/qsd_writeback.c b/lustre/quota/qsd_writeback.c
index 58f0629..9f36287 100644 (file)
--- a/lustre/quota/qsd_writeback.c
+++ b/lustre/quota/qsd_writeback.c
@@ -530,8 +530,8 @@ static int qsd_upd_thread(void *_args)
                                break;
                        count++;
                        if (count % 7 == 0) {
-                               n = list_entry(&queue, struct qsd_upd_rec,
-                                              qur_link);
+                               n = list_first_entry(&queue, struct qsd_upd_rec,
+                                                    qur_link);
                                CWARN("%s: The reintegration thread [%d] "
                                      "blocked more than %ld seconds\n",
                                      n->qur_qqi->qqi_qsd->qsd_svname,

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index a89897a..de12812 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1630,7 +1630,7 @@ t32_check() {
 t32_test_cleanup() {
        local tmp=$TMP/t32
        local facet=$SINGLEMDS
-       local rc=$?
+       local rc=0
 
        if $shall_cleanup_lustre; then
                umount $tmp/mnt/lustre || rc=$?