From: johann <johann>
Date: Fri, 18 Jul 2008 10:25:18 +0000 (+0000)
Subject: Branch b1_8_gate
X-Git-Tag: v1_7_0_51~2^32
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2751c63c6ff42529ec526dbdbb24755bd45850c7;p=fs%2Flustre-release.git

Branch b1_8_gate
b=16002
i=wangdi

Add regression test for bug 13913.
---

diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index a49c621..599e6fc 100644
--- a/lustre/obdclass/llog_obd.c
+++ b/lustre/obdclass/llog_obd.c
@@ -151,8 +151,12 @@ int llog_setup(struct obd_device *obd, int index, struct obd_device *disk_obd,
         ctxt->loc_logops = op;
         sema_init(&ctxt->loc_sem, 1);
 
-        if (op->lop_setup)
-                rc = op->lop_setup(obd, index, disk_obd, count, logid);
+        if (op->lop_setup) {
+                if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LLOG_SETUP))
+                        rc = -EOPNOTSUPP;
+                else
+                        rc = op->lop_setup(obd, index, disk_obd, count, logid);
+        }
 
         if (rc) {
                 llog_ctxt_destroy(ctxt);