b=19389

[fs/lustre-release.git] / lustre / mdd / mdd_device.c

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index a4e73ea..e2dd64b 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -413,13 +413,13 @@ static int create_dot_lustre_dir(const struct lu_env *env, struct mdd_device *m)
 
         memcpy(fid, &LU_DOT_LUSTRE_FID, sizeof(struct lu_fid));
         mdo = llo_store_create_index(env, &m->mdd_md_dev, m->mdd_child,
-                                     mdd_root_dir_name, mdd_dot_lustre_name,
+                                     mdd_root_dir_name, dot_lustre_name,
                                      fid, &dt_directory_features);
         /* .lustre dir may be already present */
         if (IS_ERR(mdo) && PTR_ERR(mdo) != -EEXIST) {
                 rc = PTR_ERR(mdo);
                 CERROR("creating obj [%s] fid = "DFID" rc = %d\n",
-                        mdd_dot_lustre_name, PFID(fid), rc);
+                        dot_lustre_name, PFID(fid), rc);
                 RETURN(rc);
         }
 
@@ -778,7 +778,7 @@ static int mdd_dot_lustre_setup(const struct lu_env *env, struct mdd_device *m)
                 return rc;
 
         dt_dot_lustre = dt_store_open(env, m->mdd_child, mdd_root_dir_name,
-                                      mdd_dot_lustre_name, fid);
+                                      dot_lustre_name, fid);
         if (IS_ERR(dt_dot_lustre)) {
                 rc = PTR_ERR(dt_dot_lustre);
                 GOTO(out, rc);
@@ -1020,13 +1020,14 @@ static int mdd_update_capa_key(const struct lu_env *env,
                                struct md_device *m,
                                struct lustre_capa_key *key)
 {
+        struct mds_capa_info info = { .uuid = NULL, .capa = key };
         struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev);
         struct obd_export *lov_exp = mdd2obd_dev(mdd)->u.mds.mds_osc_exp;
         int rc;
         ENTRY;
 
         rc = obd_set_info_async(lov_exp, sizeof(KEY_CAPA_KEY), KEY_CAPA_KEY,
-                                sizeof(*key), key, NULL);
+                                sizeof(info), &info, NULL);
         RETURN(rc);
 }
 
@@ -1285,8 +1286,8 @@ static int mdd_changelog_user_purge(struct mdd_device *mdd, int id,
 
 /** mdd_iocontrol
  * May be called remotely from mdt_iocontrol_handle or locally from
- * mdt_iocontrol. Data may be freeform - remote handling doesn't enforce or
- * swab an obd_ioctl_data format (but local ioctl handler does).
+ * mdt_iocontrol. Data may be freeform - remote handling doesn't enforce
+ * an obd_ioctl_data format (but local ioctl handler does).
  * \param cmd - ioc
  * \param len - data len
  * \param karg - ioctl data, in kernel space
@@ -1304,10 +1305,6 @@ static int mdd_iocontrol(const struct lu_env *env, struct md_device *m,
         /* Doesn't use obd_ioctl_data */
         if (cmd == OBD_IOC_CHANGELOG_CLEAR) {
                 struct changelog_setinfo *cs = karg;
-                if (len != sizeof(*cs)) {
-                        CERROR("Bad changelog_clear ioctl size %d\n", len);
-                        RETURN(-EINVAL);
-                }
                 rc = mdd_changelog_user_purge(mdd, cs->cs_id, cs->cs_recno);
                 RETURN(rc);
         }