- remove wrongly committed stuff in vbr landing

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 37dcbde..fd7c38f 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -354,38 +354,6 @@ ptlrpc_schedule_difficult_reply (struct ptlrpc_reply_state *rs)
         EXIT;
 }
 
-void ptlrpc_commit_replies_alt(struct obd_export *exp)
-{
-        struct ptlrpc_reply_state *rs, *nxt;
-        struct list_head committed_list;
-        DECLARE_RS_BATCH(batch);
-        ENTRY;
-
-        CFS_INIT_LIST_HEAD(&committed_list);
-        spin_lock(&exp->exp_uncommitted_replies_lock);
-        list_for_each_entry_safe(rs, nxt, &exp->exp_uncommitted_replies,
-                                 rs_obd_list) {
-                LASSERT (rs->rs_difficult);
-                LASSERT(rs->rs_export);
-                if (likely(rs->rs_transno <= exp->exp_last_committed))
-                        list_move(&rs->rs_obd_list, &committed_list);
-                else
-                        break;
-        }
-        spin_unlock(&exp->exp_uncommitted_replies_lock);
-
-        /* XXX: do we need this in context of commit callback? maybe separate thread
-         * should work this out */
-        rs_batch_init(&batch);
-        /* get replies that have been committed and get their service
-         * to attend to complete them. */
-        list_for_each_entry_safe(rs, nxt, &committed_list, rs_obd_list) {
-                list_del_init(&rs->rs_obd_list);
-                rs_batch_add(&batch, rs);
-        }
-        rs_batch_fini(&batch);
-        EXIT;
-}
 void ptlrpc_commit_replies(struct obd_export *exp)
 {
         struct ptlrpc_reply_state *rs, *nxt;

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e637384..c357ec8 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -4960,7 +4960,6 @@ test_120a() {
         [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
         lru_resize_enable mdc
         lru_resize_enable osc
-#        rm -rf $DIR/$tdir
 }
 run_test 120a "Early Lock Cancel: mkdir test"
 
@@ -4981,7 +4980,6 @@ test_120b() {
         [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
         lru_resize_enable mdc
         lru_resize_enable osc
-#        rm -rf $DIR/$tdir
 }
 run_test 120b "Early Lock Cancel: create test"
 
@@ -5004,7 +5002,6 @@ test_120c() {
         [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
         lru_resize_enable mdc
         lru_resize_enable osc
-#        rm -rf $DIR/$tdir
 }
 run_test 120c "Early Lock Cancel: link test"
 
@@ -5026,7 +5023,6 @@ test_120d() {
         [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
         lru_resize_enable mdc
         lru_resize_enable osc
-#        rm -rf $DIR/$tdir
 }
 run_test 120d "Early Lock Cancel: setattr test"
 
@@ -5054,7 +5050,6 @@ test_120e() {
         [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
         lru_resize_enable mdc
         lru_resize_enable osc
-#        rm -rf $DIR/$tdir
 }
 run_test 120e "Early Lock Cancel: unlink test"
 
@@ -5085,7 +5080,6 @@ test_120f() {
         [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
         lru_resize_enable mdc
         lru_resize_enable osc
-#        rm -rf $DIR/$tdir
 }
 run_test 120f "Early Lock Cancel: rename test"
 
@@ -5127,7 +5121,6 @@ test_120g() {
         # wait for commitment of removal
         lru_resize_enable mdc
         lru_resize_enable osc
-#        rm -rf $DIR/$tdir
 }
 run_test 120g "Early Lock Cancel: performance test"