b=20298

i=adilger,girish

Make HEAD to use b1_8 ldiskfs. The changes are :

1. Changing buildcvs so that HEAD will use b1_8 ldiskfs.
2. Orphan related ldiskfs patch is removed, so done cleanup in osd.

diff --git a/build/buildcvs b/build/buildcvs
index 3b30b06..d8c3c45 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -5,7 +5,7 @@ lnettag="b1_x"
 libsysiotag="HEAD"
 snmptag="HEAD"
 ldiskfstag="HEAD"
-ldiskfstag_head="b1_8_iam"
+ldiskfstag_head="HEAD"
 lustreiokittag="HEAD"
 libcfstag="b1_x"
 dmutag="" # uDMU

diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index 5ac3cc2..0f7713b 100644 (file)
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -3707,10 +3707,6 @@ static int osd_process_config(const struct lu_env *env,
 static int osd_recovery_complete(const struct lu_env *env,
                                  struct lu_device *d)
 {
-        struct osd_device *o = osd_dev(d);
-        ENTRY;
-        /* TODO: orphans handling */
-        ldiskfs_orphan_cleanup(osd_sb(o), LDISKFS_SB(osd_sb(o))->s_es);
         RETURN(0);
 }