From 4a3c0afe24b7706d0ec17b8b97d4b0aeabdfd95d Mon Sep 17 00:00:00 2001 From: bobijam Date: Mon, 10 Mar 2008 03:24:18 +0000 Subject: [PATCH] Branch b1_6 b=14321 o=Brian Behlendorf(behlendorf1@llnl.gov) i=bobijam i=shadow missed this part of the patch. --- lustre/obdclass/obd_mount.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 330cec1..352caad 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -759,8 +759,13 @@ static int lustre_stop_mgc(struct super_block *sb) * force shotdown set in umount_begin */ obd->obd_no_recov = 1; - if (obd->u.cli.cl_mgc_mgsexp) - obd_disconnect(obd->u.cli.cl_mgc_mgsexp); + if (obd->u.cli.cl_mgc_mgsexp) { + /* An error is not fatal, if we are unable to send the + disconnect mgs ping evictor cleans up the export */ + rc = obd_disconnect(obd->u.cli.cl_mgc_mgsexp); + if (rc) + CDEBUG(D_MOUNT, "disconnect failed %d\n", rc); + } /* Save the obdname for cleaning the nid uuids, which are obdname_XX */ -- 1.8.3.1