Land b_smallfix onto HEAD (20040223_1817)

[fs/lustre-release.git] / lustre / mds / mds_lov.c

diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c
index 9cd8bbc..97deb7d 100644 (file)
--- a/lustre/mds/mds_lov.c
+++ b/lustre/mds/mds_lov.c
@@ -493,10 +493,9 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         RETURN(0);
 }
 
-int mds_notify(struct obd_device *obd, struct obd_device *watched,
-               int active)
+int mds_notify(struct obd_device *obd, struct obd_device *watched, int active)
 {
-        struct obd_uuid *uuid; 
+        struct obd_uuid *uuid;
         int rc = 0;
 
         if (!active)
@@ -504,16 +503,15 @@ int mds_notify(struct obd_device *obd, struct obd_device *watched,
 
         if (strcmp(watched->obd_type->typ_name, "osc")) {
                 CERROR("unexpected notification of %s %s!\n",
-                       watched->obd_type->typ_name,
-                       watched->obd_name);
+                       watched->obd_type->typ_name, watched->obd_name);
                 RETURN(-EINVAL);
         }
 
+        uuid = &watched->u.cli.cl_import->imp_target_uuid;
         if (obd->obd_recovering) {
                 CWARN("MDS %s: in recovery, not resetting orphans on %s\n",
                       obd->obd_name, uuid->uuid);
         } else {
-                uuid = &watched->u.cli.cl_import->imp_target_uuid;
                 CWARN("MDS %s: %s now active, resetting orphans\n",
                       obd->obd_name, uuid->uuid);
                 rc = mds_lov_clearorphans(&obd->u.mds, uuid);