LU-7623 lmv: Mark lmv_hsm_ct_register/unregister uarg as __user

[fs/lustre-release.git] / lustre / lmv / lmv_obd.c

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 7acb440..78842b0 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -683,7 +683,8 @@ out_local:
         RETURN(rc);
 }
 
-static int lmv_fid2path(struct obd_export *exp, int len, void *karg, void *uarg)
+static int lmv_fid2path(struct obd_export *exp, int len, void *karg,
+                       void __user *uarg)
 {
        struct obd_device       *obddev = class_exp2obd(exp);
        struct lmv_obd          *lmv = &obddev->u.lmv;
@@ -808,7 +809,8 @@ static void lmv_hsm_req_build(struct lmv_obd *lmv,
 }
 
 static int lmv_hsm_ct_unregister(struct lmv_obd *lmv, unsigned int cmd, int len,
-                                struct lustre_kernelcomm *lk, void *uarg)
+                                struct lustre_kernelcomm *lk,
+                                void __user *uarg)
 {
        __u32   i;
        int     rc;
@@ -835,7 +837,7 @@ static int lmv_hsm_ct_unregister(struct lmv_obd *lmv, unsigned int cmd, int len,
 }
 
 static int lmv_hsm_ct_register(struct lmv_obd *lmv, unsigned int cmd, int len,
-                              struct lustre_kernelcomm *lk, void *uarg)
+                              struct lustre_kernelcomm *lk, __user void *uarg)
 {
        struct file             *filp;
        __u32                    i, j;
@@ -905,7 +907,7 @@ static int lmv_hsm_ct_register(struct lmv_obd *lmv, unsigned int cmd, int len,
 
 
 static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
-                         int len, void *karg, void *uarg)
+                        int len, void *karg, void __user *uarg)
 {
        struct obd_device       *obddev = class_exp2obd(exp);
        struct lmv_obd          *lmv = &obddev->u.lmv;
@@ -1742,26 +1744,27 @@ lmv_locate_mds(struct lmv_obd *lmv, struct md_op_data *op_data,
         * index if the file under striped dir is being restored, see
         * ct_restore(). */
        if (op_data->op_bias & MDS_CREATE_VOLATILE &&
-           (int)op_data->op_mds != -1 && lsm != NULL) {
+           (int)op_data->op_mds != -1) {
                int i;
                tgt = lmv_get_target(lmv, op_data->op_mds, NULL);
                if (IS_ERR(tgt))
                        return tgt;
 
-               /* refill the right parent fid */
-               for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
-                       struct lmv_oinfo *oinfo;
+               if (lsm != NULL) {
+                       /* refill the right parent fid */
+                       for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
+                               struct lmv_oinfo *oinfo;
 
-                       oinfo = &lsm->lsm_md_oinfo[i];
-                       if (oinfo->lmo_mds == op_data->op_mds) {
-                               *fid = oinfo->lmo_fid;
-                               break;
+                               oinfo = &lsm->lsm_md_oinfo[i];
+                               if (oinfo->lmo_mds == op_data->op_mds) {
+                                       *fid = oinfo->lmo_fid;
+                                       break;
+                               }
                        }
-               }
 
-               /* Hmm, can not find the stripe by mdt_index(op_mds) */
-               if (i == lsm->lsm_md_stripe_count)
-                       tgt = ERR_PTR(-EINVAL);
+                       if (i == lsm->lsm_md_stripe_count)
+                               *fid = lsm->lsm_md_oinfo[0].lmo_fid;
+               }
 
                return tgt;
        }
@@ -2738,25 +2741,13 @@ try_next_stripe:
        goto retry_unlink;
 }
 
-static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
+static int lmv_precleanup(struct obd_device *obd)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int rc = 0;
-
-        switch (stage) {
-        case OBD_CLEANUP_EARLY:
-                /* XXX: here should be calling obd_precleanup() down to
-                 * stack. */
-                break;
-        case OBD_CLEANUP_EXPORTS:
-                fld_client_proc_fini(&lmv->lmv_fld);
-                lprocfs_obd_cleanup(obd);
-               lprocfs_free_md_stats(obd);
-                break;
-        default:
-                break;
-        }
-        RETURN(rc);
+       ENTRY;
+       fld_client_proc_fini(&obd->u.lmv.lmv_fld);
+       lprocfs_obd_cleanup(obd);
+       lprocfs_free_md_stats(obd);
+       RETURN(0);
 }
 
 /**
@@ -3187,25 +3178,41 @@ static int lmv_get_remote_perm(struct obd_export *exp, const struct lu_fid *fid,
 }
 
 int lmv_intent_getattr_async(struct obd_export *exp,
-                             struct md_enqueue_info *minfo,
-                             struct ldlm_enqueue_info *einfo)
+                            struct md_enqueue_info *minfo)
 {
        struct md_op_data       *op_data = &minfo->mi_data;
        struct obd_device       *obd = exp->exp_obd;
        struct lmv_obd          *lmv = &obd->u.lmv;
-       struct lmv_tgt_desc     *tgt = NULL;
+       struct lmv_tgt_desc     *ptgt = NULL;
+       struct lmv_tgt_desc     *ctgt = NULL;
        int                      rc;
        ENTRY;
 
+       if (!fid_is_sane(&op_data->op_fid2))
+               RETURN(-EINVAL);
+
        rc = lmv_check_connect(obd);
        if (rc)
                RETURN(rc);
 
-       tgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid1);
-       if (IS_ERR(tgt))
-               RETURN(PTR_ERR(tgt));
+       ptgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid1);
+       if (IS_ERR(ptgt))
+               RETURN(PTR_ERR(ptgt));
+
+       ctgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid2);
+       if (IS_ERR(ctgt))
+               RETURN(PTR_ERR(ctgt));
+
+       /*
+        * if child is on remote MDT, we need 2 async RPCs to fetch both LOOKUP
+        * lock on parent, and UPDATE lock on child MDT, which makes all
+        * complicated. Considering remote dir is rare case, and not supporting
+        * it in statahead won't cause any issue, drop its support for now.
+        */
+       if (ptgt != ctgt)
+               RETURN(-ENOTSUPP);
 
-       rc = md_intent_getattr_async(tgt->ltd_exp, minfo, einfo);
+       rc = md_intent_getattr_async(ptgt->ltd_exp, minfo);
        RETURN(rc);
 }
 
@@ -3393,19 +3400,20 @@ struct md_ops lmv_md_ops = {
        .m_unpackmd             = lmv_unpackmd,
 };
 
-int __init lmv_init(void)
+static int __init lmv_init(void)
 {
        return class_register_type(&lmv_obd_ops, &lmv_md_ops, true, NULL,
                                   LUSTRE_LMV_NAME, NULL);
 }
 
-static void lmv_exit(void)
+static void __exit lmv_exit(void)
 {
-        class_unregister_type(LUSTRE_LMV_NAME);
+       class_unregister_type(LUSTRE_LMV_NAME);
 }
 
-MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre Logical Metadata Volume OBD driver");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
+MODULE_DESCRIPTION("Lustre Logical Metadata Volume");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");
 
 module_init(lmv_init);