LU-1154 clio: rename coo_attr_set to coo_attr_update

[fs/lustre-release.git] / lustre / lov / lovsub_object.c

diff --git a/lustre/lov/lovsub_object.c b/lustre/lov/lovsub_object.c
index 66130ea..e960cde 100644 (file)
--- a/lustre/lov/lovsub_object.c
+++ b/lustre/lov/lovsub_object.c
@@ -105,14 +105,14 @@ static int lovsub_object_print(const struct lu_env *env, void *cookie,
         return (*p)(env, cookie, "[%d]", los->lso_index);
 }
 
-static int lovsub_attr_set(const struct lu_env *env, struct cl_object *obj,
-                           const struct cl_attr *attr, unsigned valid)
+static int lovsub_attr_update(const struct lu_env *env, struct cl_object *obj,
+                             const struct cl_attr *attr, unsigned valid)
 {
-        struct lov_object *lov = cl2lovsub(obj)->lso_super;
+       struct lov_object *lov = cl2lovsub(obj)->lso_super;
 
-        ENTRY;
-        lov_r0(lov)->lo_attr_valid = 0;
-        RETURN(0);
+       ENTRY;
+       lov_r0(lov)->lo_attr_valid = 0;
+       RETURN(0);
 }
 
 static int lovsub_object_glimpse(const struct lu_env *env,
@@ -128,10 +128,10 @@ static int lovsub_object_glimpse(const struct lu_env *env,
 
 
 static const struct cl_object_operations lovsub_ops = {
-        .coo_page_init = lovsub_page_init,
-        .coo_lock_init = lovsub_lock_init,
-        .coo_attr_set  = lovsub_attr_set,
-        .coo_glimpse   = lovsub_object_glimpse
+       .coo_page_init    = lovsub_page_init,
+       .coo_lock_init    = lovsub_lock_init,
+       .coo_attr_update  = lovsub_attr_update,
+       .coo_glimpse      = lovsub_object_glimpse
 };
 
 static const struct lu_object_operations lovsub_lu_obj_ops = {
@@ -144,27 +144,27 @@ static const struct lu_object_operations lovsub_lu_obj_ops = {
 };
 
 struct lu_object *lovsub_object_alloc(const struct lu_env *env,
-                                      const struct lu_object_header *unused,
-                                      struct lu_device *dev)
+                                     const struct lu_object_header *unused,
+                                     struct lu_device *dev)
 {
-        struct lovsub_object *los;
-        struct lu_object     *obj;
-
-        ENTRY;
-       OBD_SLAB_ALLOC_PTR_GFP(los, lovsub_object_kmem, __GFP_IO);
-        if (los != NULL) {
-                struct cl_object_header *hdr;
-
-                obj = lovsub2lu(los);
-                hdr = &los->lso_header;
-                cl_object_header_init(hdr);
-                lu_object_init(obj, &hdr->coh_lu, dev);
-                lu_object_add_top(&hdr->coh_lu, obj);
-                los->lso_cl.co_ops = &lovsub_ops;
-                obj->lo_ops = &lovsub_lu_obj_ops;
-        } else
-                obj = NULL;
-        RETURN(obj);
+       struct lovsub_object *los;
+       struct lu_object     *obj;
+
+       ENTRY;
+       OBD_SLAB_ALLOC_PTR_GFP(los, lovsub_object_kmem, GFP_NOFS);
+       if (los != NULL) {
+               struct cl_object_header *hdr;
+
+               obj = lovsub2lu(los);
+               hdr = &los->lso_header;
+               cl_object_header_init(hdr);
+               lu_object_init(obj, &hdr->coh_lu, dev);
+               lu_object_add_top(&hdr->coh_lu, obj);
+               los->lso_cl.co_ops = &lovsub_ops;
+               obj->lo_ops = &lovsub_lu_obj_ops;
+       } else
+               obj = NULL;
+       RETURN(obj);
 }
 
 /** @} lov */