From fb17a259278faa78371a4fdd14ed544816b87a23 Mon Sep 17 00:00:00 2001 From: tappro Date: Thu, 24 Jul 2008 11:37:53 +0000 Subject: [PATCH] - land b_ver_recov --- lustre/obdclass/class_obd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index a3208f8..0e36e48 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -272,16 +272,16 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) if (!data->ioc_inlbuf1) { CERROR("No buffer passed in ioctl\n"); GOTO(out, err = -EINVAL); - } + } if (data->ioc_inllen1 < 128) { CERROR("ioctl buffer too small to hold version\n"); GOTO(out, err = -EINVAL); } - + obd = class_num2obd(index); if (!obd) GOTO(out, err = -ENOENT); - + if (obd->obd_stopping) status = "ST"; else if (obd->obd_set_up) @@ -289,7 +289,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) else if (obd->obd_attached) status = "AT"; else - status = "--"; + status = "--"; str = (char *)data->ioc_bulk; snprintf(str, len - sizeof(*data), "%3d %s %s %s %s %d", (int)index, status, obd->obd_type->typ_name, @@ -327,7 +327,9 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) } CDEBUG(D_HA, "%s: disabling committed-transno notification\n", obd->obd_name); + spin_lock_bh(&obd->obd_processing_task_lock); obd->obd_no_transno = 1; + spin_unlock_bh(&obd->obd_processing_task_lock); GOTO(out, err = 0); } -- 1.8.3.1