small fixes

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index c1062bc..0453db8 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -90,8 +90,7 @@ int lmv_intent_remote(struct obd_export *exp, void *lmm,
         /* we got LOOKUP lock, but we really need attrs */
         pmode = it->d.lustre.it_lock_mode;
         if (pmode) {
-                memcpy(&plock, &it->d.lustre.it_lock_handle,
-                       sizeof(plock));
+                memcpy(&plock, &it->d.lustre.it_lock_handle, sizeof(plock));
                 it->d.lustre.it_lock_mode = 0;
                 it->d.lustre.it_data = 0;
         }

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 3bec9fc..bed94d5 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -156,7 +156,7 @@ static int lmv_notify(struct obd_device *obd, struct obd_device *watched,
 {
         struct lmv_obd *lmv = &obd->u.lmv;
         struct obd_uuid *uuid;
-        int rc;
+        int rc = 0;
         ENTRY;
 
         if (strcmp(watched->obd_type->typ_name, LUSTRE_MDC_NAME)) {