LU-3105 osd: remove capa related stuff from servers

[fs/lustre-release.git] / lustre / ofd / ofd_objects.c

diff --git a/lustre/ofd/ofd_objects.c b/lustre/ofd/ofd_objects.c
index 3aa18f5..888186c 100644 (file)
--- a/lustre/ofd/ofd_objects.c
+++ b/lustre/ofd/ofd_objects.c
@@ -148,8 +148,7 @@ int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo)
 
        buf->lb_buf = ff;
        buf->lb_len = sizeof(*ff);
 
        buf->lb_buf = ff;
        buf->lb_len = sizeof(*ff);

-       rc = dt_xattr_get(env, ofd_object_child(fo), buf, XATTR_NAME_FID,
-                         BYPASS_CAPA);
+       rc = dt_xattr_get(env, ofd_object_child(fo), buf, XATTR_NAME_FID);

        if (rc < 0)
                return rc;
 
        if (rc < 0)
                return rc;
 


@@ -445,7 +444,7 @@ int ofd_attr_handle_ugid(const struct lu_env *env, struct ofd_object *fo,
        if (!(la->la_valid & LA_UID) && !(la->la_valid & LA_GID))
                RETURN(0);
 
        if (!(la->la_valid & LA_UID) && !(la->la_valid & LA_GID))
                RETURN(0);
 

-       rc = dt_attr_get(env, ofd_object_child(fo), ln, BYPASS_CAPA);
+       rc = dt_attr_get(env, ofd_object_child(fo), ln);

        if (rc != 0)
                RETURN(rc);
 
        if (rc != 0)
                RETURN(rc);
 


@@ -550,14 +549,13 @@ int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo,
        if (rc)
                GOTO(stop, rc);
 
        if (rc)
                GOTO(stop, rc);
 

-       rc = dt_attr_set(env, ofd_object_child(fo), la, th,
-                        ofd_object_capa(env, fo));
+       rc = dt_attr_set(env, ofd_object_child(fo), la, th);

        if (rc)
                GOTO(stop, rc);
 
        if (ff_needed) {
                rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
        if (rc)
                GOTO(stop, rc);
 
        if (ff_needed) {
                rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,

-                                 XATTR_NAME_FID, 0, th, BYPASS_CAPA);
+                                 XATTR_NAME_FID, 0, th);

                if (rc == 0) {
                        fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
                        fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
                if (rc == 0) {
                        fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
                        fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);


@@ -674,18 +672,17 @@ int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo,
        if (rc)
                GOTO(stop, rc);
 
        if (rc)
                GOTO(stop, rc);
 

-       rc = dt_punch(env, dob, start, OBD_OBJECT_EOF, th,
-                     ofd_object_capa(env, fo));
+       rc = dt_punch(env, dob, start, OBD_OBJECT_EOF, th);

        if (rc)
                GOTO(stop, rc);
 
        if (rc)
                GOTO(stop, rc);
 

-       rc = dt_attr_set(env, dob, la, th, ofd_object_capa(env, fo));
+       rc = dt_attr_set(env, dob, la, th);

        if (rc)
                GOTO(stop, rc);
 
        if (ff_needed) {
                rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
        if (rc)
                GOTO(stop, rc);
 
        if (ff_needed) {
                rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,

-                                 XATTR_NAME_FID, 0, th, BYPASS_CAPA);
+                                 XATTR_NAME_FID, 0, th);

                if (rc == 0) {
                        fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
                        fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
                if (rc == 0) {
                        fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
                        fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);


@@ -786,8 +783,7 @@ int ofd_attr_get(const struct lu_env *env, struct ofd_object *fo,
        ENTRY;
 
        if (ofd_object_exists(fo)) {
        ENTRY;
 
        if (ofd_object_exists(fo)) {

-               rc = dt_attr_get(env, ofd_object_child(fo), la,
-                                ofd_object_capa(env, fo));
+               rc = dt_attr_get(env, ofd_object_child(fo), la);

 
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
                /* Try to correct for a bug in 2.1.0 (LU-221) that caused
 
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
                /* Try to correct for a bug in 2.1.0 (LU-221) that caused