From de39e1e697fcae8e85109b52de33581898de6cdd Mon Sep 17 00:00:00 2001 From: Rahul Deshmukh Date: Thu, 17 Jun 2010 11:27:02 +0530 Subject: [PATCH] b=20226 rename osd to osd-ldiskfs i=adilger i=rread Rename the osd to osd-ldiskfs --- lustre/include/obd.h | 2 +- lustre/osd/Makefile.in | 6 +++--- lustre/osd/autoMakefile.am | 4 ++-- lustre/tests/sanity.sh | 5 ++--- lustre/tests/test-framework.sh | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lustre/include/obd.h b/lustre/include/obd.h index 1047a40..e8d6553 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -761,7 +761,7 @@ struct niobuf_local { #define LUSTRE_CMM_NAME "cmm" #define LUSTRE_MDD_NAME "mdd" -#define LUSTRE_OSD_NAME "osd" +#define LUSTRE_OSD_NAME "osd-ldiskfs" #define LUSTRE_VVP_NAME "vvp" #define LUSTRE_LMV_NAME "lmv" #define LUSTRE_CMM_MDC_NAME "cmm-mdc" diff --git a/lustre/osd/Makefile.in b/lustre/osd/Makefile.in index ad99827..b5538d7 100644 --- a/lustre/osd/Makefile.in +++ b/lustre/osd/Makefile.in @@ -1,6 +1,6 @@ -MODULES := osd -osd-objs := osd_handler.o osd_oi.o osd_igif.o osd_lproc.o osd_iam.o \ - osd_iam_lfix.o osd_iam_lvar.o +MODULES := osd_ldiskfs +osd_ldiskfs-objs := osd_handler.o osd_oi.o osd_igif.o osd_lproc.o osd_iam.o \ + osd_iam_lfix.o osd_iam_lvar.o EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs diff --git a/lustre/osd/autoMakefile.am b/lustre/osd/autoMakefile.am index 8cd8bf9..5235ad9 100644 --- a/lustre/osd/autoMakefile.am +++ b/lustre/osd/autoMakefile.am @@ -35,9 +35,9 @@ # if MODULES -modulefs_DATA = osd$(KMODEXT) +modulefs_DATA = osd_ldiskfs$(KMODEXT) endif MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -DIST_SOURCES := $(osd-objs:%.o=%.c) osd_internal.h osd_oi.h osd_igif.h \ +DIST_SOURCES := $(osd_ldiskfs-objs:%.o=%.c) osd_internal.h osd_oi.h osd_igif.h \ osd_iam.h diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index c2c83c3..aff8946 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -3331,8 +3331,7 @@ run_test 56q "check lfs find -gid and ! -gid ===============================" test_57a() { # note test will not do anything if MDS is not local remote_mds_nodsh && skip "remote MDS with nodsh" && return - - local MNTDEV="osd.*MDT*.mntdev" + local MNTDEV="osd*.*MDT*.mntdev" DEV=$(do_facet $SINGLEMDS lctl get_param -n $MNTDEV) [ -z "$DEV" ] && error "can't access $MNTDEV" for DEV in $(do_facet $SINGLEMDS lctl get_param -n $MNTDEV); do @@ -6063,7 +6062,7 @@ set_dir_limits () { for node in $(mdts_nodes); do devs=$(do_node $node "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }') for dev in $devs; do - mntdev=$(do_node $node "lctl get_param -n osd.$dev.mntdev") + mntdev=$(do_node $node "lctl get_param -n osd*.$dev.mntdev") do_node $node "echo $1 >$LDPROC/\\\$(basename $mntdev)/max_dir_size" done done diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 1093952..a00b26b 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -348,7 +348,7 @@ load_modules_local() { load_module mdt/mdt load_module lvfs/fsfilt_$FSTYPE load_module cmm/cmm - load_module osd/osd + load_module osd/osd_ldiskfs load_module ost/ost load_module obdfilter/obdfilter fi -- 1.8.3.1