From f496eec1a900731497e3cacb9aece6721468accd Mon Sep 17 00:00:00 2001 From: pschwan Date: Thu, 7 Nov 2002 00:21:23 +0000 Subject: [PATCH] merging all noncontroversial pieces of b_symlink into HEAD --- lustre/include/linux/lustre_lib.h | 2 +- lustre/ldlm/ldlm_lockd.c | 7 ++- lustre/obdfilter/filter.c | 2 +- lustre/osc/osc_request.c | 4 ++ lustre/tests/Makefile.am | 3 +- lustre/tests/local.sh | 2 +- lustre/tests/sanity.sh | 110 +++++++++++++++++++++++++------------- lustre/tests/stat.c | 24 +++++++++ 8 files changed, 108 insertions(+), 46 deletions(-) create mode 100644 lustre/tests/stat.c diff --git a/lustre/include/linux/lustre_lib.h b/lustre/include/linux/lustre_lib.h index c9f6344..7cfac66 100644 --- a/lustre/include/linux/lustre_lib.h +++ b/lustre/include/linux/lustre_lib.h @@ -98,7 +98,7 @@ struct brw_cb_data { void *brw_data; }; -int ll_sync_brw_cb(struct brw_cb_data *data, int err, int phase); +int ll_sync_brw_cb(struct brw_cb_data *brw_cbd, int err, int phase); struct brw_cb_data *ll_init_brw_cb_data(void); /* simple.c */ diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 43d23fb..1270275 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -615,7 +615,7 @@ static int ldlm_setup(struct obd_device *obddev, obd_count len, void *buf) ldlm_callback_handler, "ldlm_cbd"); if (!ldlm->ldlm_cb_service) - GOTO(out_dec, rc = -ENOMEM); + GOTO(out_proc, rc = -ENOMEM); ldlm->ldlm_cancel_service = ptlrpc_init_svc(LDLM_NEVENTS, LDLM_NBUFS, LDLM_BUFSIZE, @@ -624,7 +624,7 @@ static int ldlm_setup(struct obd_device *obddev, obd_count len, void *buf) ldlm_cancel_handler, "ldlm_canceld"); if (!ldlm->ldlm_cancel_service) - GOTO(out_dec, rc = -ENOMEM); + GOTO(out_proc, rc = -ENOMEM); for (i = 0; i < LDLM_NUM_THREADS; i++) { char name[32]; @@ -666,8 +666,7 @@ static int ldlm_setup(struct obd_device *obddev, obd_count len, void *buf) ptlrpc_unregister_service(ldlm->ldlm_cb_service); out_proc: - - ldlm_proc_cleanup(obddev); + ldlm_proc_cleanup(obddev); out_dec: MOD_DEC_USE_COUNT; diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index 1177e28..a5d5d0e 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -948,7 +948,7 @@ static int filter_truncate(struct lustre_handle *conn, struct obdo *oa, static int filter_pgcache_brw(int cmd, struct lustre_handle *conn, struct lov_stripe_md *lsm, obd_count oa_bufs, struct brw_page *pga, brw_cb_t callback, - struct brw_cb_data *data) + struct brw_cb_data *brw_cbd) { struct obd_export *export = class_conn2export(conn); struct obd_run_ctxt saved; diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index 4a21bd3..e8b81ac 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -332,6 +332,10 @@ static void unmap_and_decref_bulk_desc(void *data) EXIT; } +/* this is the callback function which is invoked by the Portals + * event handler associated with the bulk_sink queue and bulk_source queue. + */ + static void osc_ptl_ev_hdlr(struct ptlrpc_bulk_desc *desc, void *data) { struct osc_brw_cb_data *cb_data = data; diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am index 99f9410..062d3b6 100644 --- a/lustre/tests/Makefile.am +++ b/lustre/tests/Makefile.am @@ -23,7 +23,7 @@ noinst_SCRIPTS += fs.sh intent-test.sh intent-test2.sh leak_finder.pl \ runtests runvmstat snaprun.sh tbox.sh common.sh noinst_PROGRAMS = openunlink testreq truncate directio openme writeme mcreate noinst_PROGRAMS += munlink tchmod toexcl fsx test_brw openclose createdestroy -noinst_PROGRAMS += lovstripe # ldaptest +noinst_PROGRAMS += lovstripe stat # ldaptest # ldaptest_SOURCES = ldaptest.c tchmod_SOURCES = tchmod.c @@ -41,5 +41,6 @@ test_brw_SOURCES = test_brw.c openclose_SOURCES = openclose.c createdestroy_SOURCES = createdestroy.c lovstripe_SOURCES = lovstripe.c +stat_SOURCES = stat.c include $(top_srcdir)/Rules diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh index 44d92cb..c56d3a8 100755 --- a/lustre/tests/local.sh +++ b/lustre/tests/local.sh @@ -9,7 +9,7 @@ MDSDEV=$TMP/mds1 MDSSIZE=50000 OSTDEV=$TMP/ost1 -OSTSIZE=100000 +OSTSIZE=50000 kver=`uname -r | cut -d "." -f 1,2` diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 9f0b993..df7ccff 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -1,135 +1,153 @@ #!/bin/bash +#CLEAN=umount /mnt/lustre +#START=../utils/lconf --minlevel 70 local.xml +CLEAN="sh llmountcleanup.sh" +START="sh llmount.sh" + + + +echo '==== touch /mnt/lustre/f ; rm /mnt/lustre/* ==== test 19' +touch /mnt/lustre/f +rm /mnt/lustre/* +$CLEAN +dmesg | grep -i destruct +$START + + echo '=============================== test 1' mkdir /mnt/lustre/d1 mkdir /mnt/lustre/d1/d2 -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START + echo '=============================== test 2' mkdir /mnt/lustre/d2 touch /mnt/lustre/d2/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 3 mkdir /mnt/lustre/d3 -umount /mnt/lustre -../utils/lconf --minlevel 70 local.xml +$CLEAN +$START touch /mnt/lustre/d3/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 4 mkdir /mnt/lustre/d4 -umount /mnt/lustre -../utils/lconf --minlevel 70 local.xml +$CLEAN +$START mkdir /mnt/lustre/d4/d2 -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 5 mkdir /mnt/lustre/d5 mkdir /mnt/lustre/d5/d2 chmod 0666 /mnt/lustre/d5/d2 -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 6 touch /mnt/lustre/f6 chmod 0666 /mnt/lustre/f6 -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 7 mkdir /mnt/lustre/d7 ./mcreate /mnt/lustre/d7/f chmod 0666 /mnt/lustre/d7/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 8 mkdir /mnt/lustre/d8 touch /mnt/lustre/d8/f chmod 0666 /mnt/lustre/d8/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '=============9=================' test 9 mkdir /mnt/lustre/d9 mkdir /mnt/lustre/d9/d2 mkdir /mnt/lustre/d9/d2/d3 -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 10 mkdir /mnt/lustre/d10 mkdir /mnt/lustre/d10/d2 touch /mnt/lustre/d10/d2/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 11 mkdir /mnt/lustre/d11 mkdir /mnt/lustre/d11/d2 chmod 0666 /mnt/lustre/d11/d2 chmod 0555 /mnt/lustre/d11/d2 -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 12 mkdir /mnt/lustre/d12 touch /mnt/lustre/d12/f chmod 0666 /mnt/lustre/d12/f chmod 0555 /mnt/lustre/d12/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 13 mkdir /mnt/lustre/d13 cp /etc/passwd /mnt/lustre/d13/f > /mnt/lustre/d13/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START + echo '===============================' test 14 mkdir /mnt/lustre/d14 touch /mnt/lustre/d14/f rm /mnt/lustre/d14/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START + echo '===============================' test 15 mkdir /mnt/lustre/d15 touch /mnt/lustre/d15/f mv /mnt/lustre/d15/f /mnt/lustre/d15/f2 -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '===============================' test 16 mkdir /mnt/lustre/d16 touch /mnt/lustre/d16/f rm -rf /mnt/lustre/d16/f -umount /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START echo '====== symlinks: create, remove symlinks (dangling and real) =====' test 17 mkdir /mnt/lustre/d17 @@ -139,6 +157,22 @@ ln -s no-such-file /mnt/lustre/d17/l-dangle ls -l /mnt/lustre/d17 rm -f /mnt/lustre/l-dangle rm -f /mnt/lustre/l-exist -umount /mnt/lustre +$CLEAN +dmesg | grep -i destruct +$START + +echo '==== touch /mnt/lustre/f ; ls /mnt/lustre ==== test 17' +touch /mnt/lustre/f +ls /mnt/lustre +$CLEAN dmesg | grep -i destruct -../utils/lconf --minlevel 70 local.xml +$START + +echo '==== touch /mnt/lustre/f ; ls -l /mnt/lustre ==== test 18' +touch /mnt/lustre/f +ls -l /mnt/lustre +$CLEAN +dmesg | grep -i destruct +$START + +exit diff --git a/lustre/tests/stat.c b/lustre/tests/stat.c new file mode 100644 index 0000000..b719900 --- /dev/null +++ b/lustre/tests/stat.c @@ -0,0 +1,24 @@ +#include +#include +#include +#include +#include +#include +#include + +int main(int argc, char ** argv) +{ + int rc; + struct stat buf; + + if (argc < 2) { + printf("Usage %s filename\n", argv[0]); + return 1; + } + + rc = stat(argv[1], &buf); + if (rc) { + printf("stat(%s) error: %s\n", argv[1], strerror(errno)); + } + return rc; +} -- 1.8.3.1