From 4df9b4e22d363fc379ebe3b5d3c37d894b709d09 Mon Sep 17 00:00:00 2001 From: tappro Date: Wed, 26 Nov 2008 08:05:06 +0000 Subject: [PATCH] - check that fs is version-capable and avoid VBR if not b:17717 i:adilger,alex --- lustre/ldlm/ldlm_lib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index e751371..f237cab 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -1240,10 +1240,13 @@ static void target_recovery_expired(unsigned long castmeharder) cfs_time_current_sec()- obd->obd_recovery_start, obd->obd_connected_clients); - - /* VBR: stale exports should be marked as delayed */ - class_handle_stale_exports(obd); - + /** check is fs version-capable */ + if (target_fs_version_capable(obd)) { + class_handle_stale_exports(obd); + } else { + CWARN("Versions are not supported by ldiskfs, VBR is OFF\n"); + class_disconnect_stale_exports(obd, exp_flags_from_obd(obd)); + } spin_lock_bh(&obd->obd_processing_task_lock); /* VBR: no clients are remained to replay, stop recovery */ if (obd->obd_recovering && obd->obd_recoverable_clients == 0) -- 1.8.3.1