LU-3105 osd: remove capa related stuff from servers

[fs/lustre-release.git] / lustre / lfsck / lfsck_layout.c

diff --git a/lustre/lfsck/lfsck_layout.c b/lustre/lfsck/lfsck_layout.c
index c94cf83..bb873c8 100644 (file)
--- a/lustre/lfsck/lfsck_layout.c
+++ b/lustre/lfsck/lfsck_layout.c
@@ -119,7 +119,7 @@ lfsck_layout_object_init(const struct lu_env *env, struct dt_object *obj,
        if (llo == NULL)
                return ERR_PTR(-ENOMEM);
 
-       rc = dt_attr_get(env, obj, &llo->llo_attr, BYPASS_CAPA);
+       rc = dt_attr_get(env, obj, &llo->llo_attr);
        if (rc != 0) {
                OBD_FREE_PTR(llo);
 
@@ -373,10 +373,9 @@ static int lfsck_layout_get_lovea(const struct lu_env *env,
        int rc;
 
 again:
-       rc = dt_xattr_get(env, obj, buf, XATTR_NAME_LOV, BYPASS_CAPA);
+       rc = dt_xattr_get(env, obj, buf, XATTR_NAME_LOV);
        if (rc == -ERANGE) {
-               rc = dt_xattr_get(env, obj, &LU_BUF_NULL, XATTR_NAME_LOV,
-                                 BYPASS_CAPA);
+               rc = dt_xattr_get(env, obj, &LU_BUF_NULL, XATTR_NAME_LOV);
                if (rc <= 0)
                        return rc;
 
@@ -1038,14 +1037,14 @@ static int fid_is_for_ostobj(const struct lu_env *env,
 
        lma = &lfsck_env_info(env)->lti_lma;
        rc = dt_xattr_get(env, obj, lfsck_buf_get(env, lma, sizeof(*lma)),
-                         XATTR_NAME_LMA, BYPASS_CAPA);
+                         XATTR_NAME_LMA);
        if (rc == sizeof(*lma)) {
                lustre_lma_swab(lma);
 
                return lma->lma_compat & LMAC_FID_ON_OST ? 1 : 0;
        }
 
-       rc = dt_xattr_get(env, obj, &LU_BUF_NULL, XATTR_NAME_FID, BYPASS_CAPA);
+       rc = dt_xattr_get(env, obj, &LU_BUF_NULL, XATTR_NAME_FID);
 
        return rc > 0;
 }
@@ -1464,7 +1463,7 @@ static int lfsck_layout_get_def_stripesize(const struct lu_env *env,
 
        /* Get the default stripe size via xattr_get on the backend root. */
        rc = dt_xattr_get(env, root, lfsck_buf_get(env, lum, sizeof(*lum)),
-                         XATTR_NAME_LOV, BYPASS_CAPA);
+                         XATTR_NAME_LOV);
        if (rc > 0) {
                /* The lum->lmm_stripe_size is LE mode. The *size also
                 * should be LE mode. So it is unnecessary to convert. */
@@ -1528,8 +1527,7 @@ static int lfsck_layout_refill_lovea(const struct lu_env *env,
        }
 
        lfsck_buf_init(&ea_buf, lmm, lov_mds_md_size(count, magic));
-       rc = dt_xattr_set(env, parent, &ea_buf, XATTR_NAME_LOV, fl, handle,
-                         BYPASS_CAPA);
+       rc = dt_xattr_set(env, parent, &ea_buf, XATTR_NAME_LOV, fl, handle);
        if (rc == 0)
                rc = 1;
 
@@ -1650,8 +1648,7 @@ static int __lfsck_layout_update_pfid(const struct lu_env *env,
        if (rc != 0)
                GOTO(stop, rc);
 
-       rc = dt_xattr_set(env, child, &buf, XATTR_NAME_FID, 0, handle,
-                         BYPASS_CAPA);
+       rc = dt_xattr_set(env, child, &buf, XATTR_NAME_FID, 0, handle);
 
        GOTO(stop, rc);
 
@@ -1830,7 +1827,7 @@ again:
                snprintf(name, NAME_MAX, DFID"%s-%s-%d", PFID(pfid), infix,
                         type, idx++);
                rc = dt_lookup(env, lfsck->li_lpf_obj, (struct dt_rec *)tfid,
-                              (const struct dt_key *)name, BYPASS_CAPA);
+                              (const struct dt_key *)name);
                if (rc != 0 && rc != -ENOENT)
                        GOTO(log, rc);
        } while (rc == 0);
@@ -1843,7 +1840,7 @@ again:
        /* Re-check whether the name conflict with othrs after taken
         * the ldlm lock. */
        rc = dt_lookup(env, lfsck->li_lpf_obj, (struct dt_rec *)tfid,
-                      (const struct dt_key *)name, BYPASS_CAPA);
+                      (const struct dt_key *)name);
        if (unlikely(rc == 0)) {
                lfsck_unlock(llh);
                goto again;
@@ -1906,12 +1903,11 @@ again:
                GOTO(stop, rc);
 
        rc = dt_insert(env, lpf, (const struct dt_rec *)dtrec,
-                      (const struct dt_key *)name, th, BYPASS_CAPA, 1);
+                      (const struct dt_key *)name, th, 1);
        if (rc != 0)
                GOTO(stop, rc);
 
-       rc = dt_xattr_set(env, pobj, &linkea_buf,
-                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
+       rc = dt_xattr_set(env, pobj, &linkea_buf, XATTR_NAME_LINK, 0, th);
        if (rc == 0 && cobj != NULL) {
                dt_trans_stop(env, dev, th);
                th = NULL;
@@ -2031,7 +2027,7 @@ static int lfsck_layout_slave_conditional_destroy(const struct lu_env *env,
        }
 
        /* Get obj's attr without lock firstly. */
-       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
+       rc = dt_attr_get(env, obj, la);
        dt_read_unlock(env, obj);
        if (rc != 0)
                GOTO(put, rc);
@@ -2054,7 +2050,7 @@ static int lfsck_layout_slave_conditional_destroy(const struct lu_env *env,
 
        dt_write_lock(env, obj, 0);
        /* Get obj's attr within lock again. */
-       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
+       rc = dt_attr_get(env, obj, la);
        if (rc != 0)
                GOTO(unlock, rc);
 
@@ -2295,10 +2291,9 @@ again:
 
        dt_write_lock(env, parent, 0);
        locked = true;
-       rc = dt_xattr_get(env, parent, buf, XATTR_NAME_LOV, BYPASS_CAPA);
+       rc = dt_xattr_get(env, parent, buf, XATTR_NAME_LOV);
        if (rc == -ERANGE) {
-               rc = dt_xattr_get(env, parent, &LU_BUF_NULL, XATTR_NAME_LOV,
-                                 BYPASS_CAPA);
+               rc = dt_xattr_get(env, parent, &LU_BUF_NULL, XATTR_NAME_LOV);
                LASSERT(rc != 0);
                goto again;
        } else if (rc == -ENODATA || rc == 0) {
@@ -2601,7 +2596,7 @@ static int lfsck_layout_scan_orphan(const struct lu_env *env,
                GOTO(put, rc);
 
        iops = &obj->do_index_ops->dio_it;
-       di = iops->init(env, obj, 0, BYPASS_CAPA);
+       di = iops->init(env, obj, 0);
        if (IS_ERR(di))
                GOTO(put, rc = PTR_ERR(di));
 
@@ -2748,7 +2743,7 @@ static int lfsck_layout_repair_dangling(const struct lu_env *env,
                GOTO(unlock2, rc);
 
        rc = dt_xattr_set(env, child, buf, XATTR_NAME_FID, LU_XATTR_CREATE,
-                         handle, BYPASS_CAPA);
+                         handle);
 
        GOTO(unlock2, rc);
 
@@ -2832,18 +2827,17 @@ static int lfsck_layout_repair_unmatched_pair(const struct lu_env *env,
        if (unlikely(lfsck_is_dead_obj(parent)))
                GOTO(unlock2, rc = 1);
 
-       rc = dt_xattr_set(env, child, buf, XATTR_NAME_FID, 0, handle,
-                         BYPASS_CAPA);
+       rc = dt_xattr_set(env, child, buf, XATTR_NAME_FID, 0, handle);
        if (rc != 0)
                GOTO(unlock2, rc);
 
        /* Get the latest parent's owner. */
-       rc = dt_attr_get(env, parent, tla, BYPASS_CAPA);
+       rc = dt_attr_get(env, parent, tla);
        if (rc != 0)
                GOTO(unlock2, rc);
 
        tla->la_valid = LA_UID | LA_GID;
-       rc = dt_attr_set(env, child, tla, handle, BYPASS_CAPA);
+       rc = dt_attr_set(env, child, tla, handle);
 
        GOTO(unlock2, rc);
 
@@ -2986,7 +2980,7 @@ static int lfsck_layout_repair_multiple_references(const struct lu_env *env,
        if (unlikely(lfsck_is_dead_obj(parent)))
                GOTO(unlock, rc = 0);
 
-       rc = dt_xattr_get(env, parent, buf, XATTR_NAME_LOV, BYPASS_CAPA);
+       rc = dt_xattr_get(env, parent, buf, XATTR_NAME_LOV);
        if (unlikely(rc == 0 || rc == -ENODATA || rc == -ERANGE))
                GOTO(unlock, rc = 0);
 
@@ -3020,7 +3014,7 @@ static int lfsck_layout_repair_multiple_references(const struct lu_env *env,
                       lov_mds_md_size(le16_to_cpu(lmm->lmm_stripe_count),
                                       magic));
        rc = dt_xattr_set(env, parent, &ea_buf, XATTR_NAME_LOV,
-                         LU_XATTR_REPLACE, handle, BYPASS_CAPA);
+                         LU_XATTR_REPLACE, handle);
 
        GOTO(unlock, rc = (rc == 0 ? 1 : rc));
 
@@ -3083,7 +3077,7 @@ static int lfsck_layout_repair_owner(const struct lu_env *env,
                GOTO(unlock, rc = 1);
 
        /* Get the latest parent's owner. */
-       rc = dt_attr_get(env, parent, tla, BYPASS_CAPA);
+       rc = dt_attr_get(env, parent, tla);
        if (rc != 0)
                GOTO(unlock, rc);
 
@@ -3093,7 +3087,7 @@ static int lfsck_layout_repair_owner(const struct lu_env *env,
                GOTO(unlock, rc = 1);
 
        tla->la_valid = LA_UID | LA_GID;
-       rc = dt_attr_set(env, child, tla, handle, BYPASS_CAPA);
+       rc = dt_attr_set(env, child, tla, handle);
 
        GOTO(unlock, rc);
 
@@ -3247,7 +3241,7 @@ static int lfsck_layout_check_parent(const struct lu_env *env,
                         * for a non-existent xattr to check if this object
                         * has been been removed or not. */
                        rc = dt_xattr_get(env, tobj, &LU_BUF_NULL,
-                                         XATTR_NAME_DUMMY, BYPASS_CAPA);
+                                         XATTR_NAME_DUMMY);
                        if (unlikely(rc == -ENOENT || rc >= 0)) {
                                rc = LLIT_UNMATCHED_PAIR;
                        } else if (rc == -ENODATA) {
@@ -3302,11 +3296,11 @@ static int lfsck_layout_assistant_handler_p1(const struct lu_env *env,
        if (unlikely(lfsck_is_dead_obj(parent)))
                GOTO(put_parent, rc = 0);
 
-       rc = dt_attr_get(env, parent, pla, BYPASS_CAPA);
+       rc = dt_attr_get(env, parent, pla);
        if (rc != 0)
                GOTO(out, rc);
 
-       rc = dt_attr_get(env, child, cla, BYPASS_CAPA);
+       rc = dt_attr_get(env, child, cla);
        if (rc == -ENOENT) {
                if (unlikely(lfsck_is_dead_obj(parent)))
                        GOTO(put_parent, rc = 0);
@@ -3319,7 +3313,7 @@ static int lfsck_layout_assistant_handler_p1(const struct lu_env *env,
                GOTO(out, rc);
 
        lfsck_buf_init(&buf, pea, sizeof(struct filter_fid_old));
-       rc = dt_xattr_get(env, child, &buf, XATTR_NAME_FID, BYPASS_CAPA);
+       rc = dt_xattr_get(env, child, &buf, XATTR_NAME_FID);
        if (unlikely(rc >= 0 && rc != sizeof(struct filter_fid_old) &&
                     rc != sizeof(struct filter_fid))) {
                type = LLIT_UNMATCHED_PAIR;
@@ -4306,12 +4300,11 @@ static int lfsck_layout_scan_stripes(const struct lu_env *env,
                        goto next;
                }
 
-               rc = dt_declare_attr_get(env, cobj, BYPASS_CAPA);
+               rc = dt_declare_attr_get(env, cobj);
                if (rc != 0)
                        goto next;
 
-               rc = dt_declare_xattr_get(env, cobj, &buf, XATTR_NAME_FID,
-                                         BYPASS_CAPA);
+               rc = dt_declare_xattr_get(env, cobj, &buf, XATTR_NAME_FID);
                if (rc != 0)
                        goto next;
 
@@ -4478,7 +4471,7 @@ again:
        }
 
        rc = dt_xattr_set(env, obj, &ea_buf, XATTR_NAME_LOV,
-                         LU_XATTR_REPLACE, handle, BYPASS_CAPA);
+                         LU_XATTR_REPLACE, handle);
        if (rc != 0)
                GOTO(out, rc);
 
@@ -5735,8 +5728,7 @@ stop:
 static int lfsck_orphan_index_lookup(const struct lu_env *env,
                                     struct dt_object *dt,
                                     struct dt_rec *rec,
-                                    const struct dt_key *key,
-                                    struct lustre_capa *capa)
+                                    const struct dt_key *key)
 {
        return -EOPNOTSUPP;
 }
@@ -5755,7 +5747,6 @@ static int lfsck_orphan_index_insert(const struct lu_env *env,
                                     const struct dt_rec *rec,
                                     const struct dt_key *key,
                                     struct thandle *handle,
-                                    struct lustre_capa *capa,
                                     int ignore_quota)
 {
        return -EOPNOTSUPP;
@@ -5772,16 +5763,14 @@ static int lfsck_orphan_index_declare_delete(const struct lu_env *env,
 static int lfsck_orphan_index_delete(const struct lu_env *env,
                                     struct dt_object *dt,
                                     const struct dt_key *key,
-                                    struct thandle *handle,
-                                    struct lustre_capa *capa)
+                                    struct thandle *handle)
 {
        return -EOPNOTSUPP;
 }
 
 static struct dt_it *lfsck_orphan_it_init(const struct lu_env *env,
                                          struct dt_object *dt,
-                                         __u32 attr,
-                                         struct lustre_capa *capa)
+                                         __u32 attr)
 {
        struct dt_device                *dev    = lu2dt_dev(dt->do_lu.lo_dev);
        struct lfsck_instance           *lfsck;
@@ -6018,12 +6007,12 @@ again1:
                goto again1;
        }
 
-       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
+       rc = dt_attr_get(env, obj, la);
        if (rc != 0)
                GOTO(out, rc);
 
        rc = dt_xattr_get(env, obj, lfsck_buf_get(env, pfid, sizeof(*pfid)),
-                         XATTR_NAME_FID, BYPASS_CAPA);
+                         XATTR_NAME_FID);
        if (rc == -ENODATA) {
                /* For the pre-created OST-object, update the bitmap to avoid
                 * others LFSCK (second phase) iteration to touch it again. */