diff --git a/build/buildcvs b/build/buildcvs
index 5061dc477e27957ba314a21912a4861c1d27d71d..265a30c37d382121397a0287e001278569491892 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -171,18 +171,10 @@ case "$lustretag" in
 
     b_hd_lnet_smp)
         # LNet grained locking and SMP improvement branch
+        libcfstag="b_hd_libcfs_smp"
         lnettag="b_hd_lnet_smp"
-        ldiskfstag="lnet_smp_ldiskfs"
-        lustretag="lnet_smp_lustre"
-        libcfstag="lnet_smp_libcfs"
-        ;;
-
-    b_hd_lnet_perf)
-        # Tag for lnet performance tests
-        lnettag="lnet_smp_lnet"
-        ldiskfstag="lnet_smp_ldiskfs"
-        lustretag="lnet_smp_lustre"
-        libcfstag="lnet_smp_libcfs"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="b_hd_lustre_smp"
         ;;
 
     b_hd_o2ib_new_proto)