b=20226 rename osd to osd-ldiskfs

i=rread

diff --git a/lustre/Makefile.in b/lustre/Makefile.in
index f1c44fa..04441db 100644 (file)
--- a/lustre/Makefile.in
+++ b/lustre/Makefile.in
@@ -8,7 +8,7 @@ subdir-m += obdecho
 subdir-m += mgc
 subdir-m += quota
 
-@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd osd
+@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd osd-ldiskfs
 @CLIENT_TRUE@subdir-m += mdc lmv llite fld
 
 @INCLUDE_RULES@

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 51658ae..7183812 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -40,7 +40,7 @@ AUTOMAKE_OPTIONS = foreign
 ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
        mgc fid fld doc utils tests scripts autoconf contrib
 
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd
+SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd-ldiskfs
 
 CLIENT_SUBDIRS := mdc lmv llite lclient
 

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index c1b447e..acc2415 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2556,8 +2556,8 @@ lustre/osc/Makefile
 lustre/osc/autoMakefile
 lustre/ost/Makefile
 lustre/ost/autoMakefile
-lustre/osd/Makefile
-lustre/osd/autoMakefile
+lustre/osd-ldiskfs/Makefile
+lustre/osd-ldiskfs/autoMakefile
 lustre/mgc/Makefile
 lustre/mgc/autoMakefile
 lustre/mgs/Makefile

diff --git a/lustre/osd/Makefile.in b/lustre/osd-ldiskfs/Makefile.in
similarity index 100%
rename from lustre/osd/Makefile.in
rename to lustre/osd-ldiskfs/Makefile.in

diff --git a/lustre/osd/autoMakefile.am b/lustre/osd-ldiskfs/autoMakefile.am
similarity index 100%
rename from lustre/osd/autoMakefile.am
rename to lustre/osd-ldiskfs/autoMakefile.am

diff --git a/lustre/osd/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
similarity index 100%
rename from lustre/osd/osd_handler.c
rename to lustre/osd-ldiskfs/osd_handler.c

diff --git a/lustre/osd/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c
similarity index 100%
rename from lustre/osd/osd_iam.c
rename to lustre/osd-ldiskfs/osd_iam.c

diff --git a/lustre/osd/osd_iam.h b/lustre/osd-ldiskfs/osd_iam.h
similarity index 100%
rename from lustre/osd/osd_iam.h
rename to lustre/osd-ldiskfs/osd_iam.h

diff --git a/lustre/osd/osd_iam_lfix.c b/lustre/osd-ldiskfs/osd_iam_lfix.c
similarity index 100%
rename from lustre/osd/osd_iam_lfix.c
rename to lustre/osd-ldiskfs/osd_iam_lfix.c

diff --git a/lustre/osd/osd_iam_lvar.c b/lustre/osd-ldiskfs/osd_iam_lvar.c
similarity index 100%
rename from lustre/osd/osd_iam_lvar.c
rename to lustre/osd-ldiskfs/osd_iam_lvar.c

diff --git a/lustre/osd/osd_igif.c b/lustre/osd-ldiskfs/osd_igif.c
similarity index 100%
rename from lustre/osd/osd_igif.c
rename to lustre/osd-ldiskfs/osd_igif.c

diff --git a/lustre/osd/osd_igif.h b/lustre/osd-ldiskfs/osd_igif.h
similarity index 100%
rename from lustre/osd/osd_igif.h
rename to lustre/osd-ldiskfs/osd_igif.h

diff --git a/lustre/osd/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
similarity index 100%
rename from lustre/osd/osd_internal.h
rename to lustre/osd-ldiskfs/osd_internal.h

diff --git a/lustre/osd/osd_lproc.c b/lustre/osd-ldiskfs/osd_lproc.c
similarity index 100%
rename from lustre/osd/osd_lproc.c
rename to lustre/osd-ldiskfs/osd_lproc.c

diff --git a/lustre/osd/osd_oi.c b/lustre/osd-ldiskfs/osd_oi.c
similarity index 100%
rename from lustre/osd/osd_oi.c
rename to lustre/osd-ldiskfs/osd_oi.c

diff --git a/lustre/osd/osd_oi.h b/lustre/osd-ldiskfs/osd_oi.h
similarity index 100%
rename from lustre/osd/osd_oi.h
rename to lustre/osd-ldiskfs/osd_oi.h

diff --git a/lustre/osd/.cvsignore b/lustre/osd/.cvsignore
deleted file mode 100644 (file)
index 5d26f00..0000000
--- a/lustre/osd/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend

diff --git a/lustre/osd/.gitignore b/lustre/osd/.gitignore
deleted file mode 100644 (file)
index ecdce2f..0000000
--- a/lustre/osd/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-/.Xrefs
-/config.log
-/config.status
-/configure
-/Makefile
-/.deps
-/TAGS
-/.*.cmd
-/autoMakefile.in
-/autoMakefile
-/*.ko
-/*.mod.c
-/.*.flags
-/.tmp_versions
-/.depend