From 3ccf13b29dec68dc45edf15c8157b2b18de0d1d8 Mon Sep 17 00:00:00 2001 From: wangdi Date: Sun, 4 Sep 2005 03:21:20 +0000 Subject: [PATCH] Branch: HEAD remove lov_tgt_pending, which is useless for ost add/del --- lustre/lov/lov_internal.h | 16 ---------------- lustre/lov/lov_obd.c | 9 +++------ 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h index 5aec901..75258d7 100644 --- a/lustre/lov/lov_internal.h +++ b/lustre/lov/lov_internal.h @@ -142,22 +142,6 @@ lov_tgt_decref(struct lov_obd *lov, struct lov_tgt_desc *tgt) wake_up(&lov->lov_tgt_waitq); } -static inline int -lov_tgt_pending(struct lov_obd *lov, struct lov_tgt_desc *tgt, int gen) -{ - int rc = 0; - lov_tgts_lock(lov); - - if (((gen == 0) || (gen == tgt->ltd_gen)) && - (tgt->ltd_flags &(LTD_ACTIVE|LTD_DEL_PENDING)) == LTD_DEL_PENDING) { - tgt->ltd_refcount++; - rc = 1; - } - - lov_tgts_unlock(lov); - return rc; -} - struct lov_async_page { int lap_magic; int lap_stripe; diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index 2df455b..ba15470 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -1503,8 +1503,7 @@ static int lov_queue_async_io(struct obd_export *exp, loi = &lsm->lsm_oinfo[lap->lap_stripe]; tgt = lov->tgts + loi->loi_ost_idx; - if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen) && - !lov_tgt_pending(lov, tgt, loi->loi_ost_gen)) + if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) RETURN(-EIO); rc = obd_queue_async_io(tgt->ltd_exp, lsm, loi, lap->lap_sub_cookie, @@ -1533,8 +1532,7 @@ static int lov_set_async_flags(struct obd_export *exp, loi = &lsm->lsm_oinfo[lap->lap_stripe]; tgt = lov->tgts + loi->loi_ost_idx; - if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen) && - !lov_tgt_pending(lov, tgt, loi->loi_ost_gen)) + if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) RETURN(-EIO); rc = obd_set_async_flags(tgt->ltd_exp, lsm, loi, lap->lap_sub_cookie, @@ -1565,8 +1563,7 @@ static int lov_queue_group_io(struct obd_export *exp, loi = &lsm->lsm_oinfo[lap->lap_stripe]; tgt = lov->tgts + loi->loi_ost_idx; - if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen) && - !lov_tgt_pending(lov, tgt, loi->loi_ost_gen)) + if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) RETURN(-EIO); rc = obd_queue_group_io(tgt->ltd_exp, lsm, loi, oig, -- 1.8.3.1